zen-flow 1.15.0 → 2.0.2

package/README.md

@@ -87,6 +87,7 @@ Array.from({ length: 11 })
 
 ## API
 
+ - Types(#types)
  - MineCraft
    - [Vanilla](#vanilla)
       - [Crafting patterns](#craftingpatterns)
@@ -100,6 +101,52 @@ Array.from({ length: 11 })
     - [NEI](#nei)
     - [ThermalExpansion](#thermalexpansion)
 
+## Types
+
+```TS
+type Stack = {
+  id: string,
+  n: number
+};
+
+type Ingredient = string | Stack;
+
+type RecipeShaped = Partial<{
+  1: string
+  2: string
+  3: string
+  4: string
+  5: string
+  6: string
+  7: string
+  8: string
+  9: string
+  corner: string
+  edge: string
+  ring: string
+  square: string
+  center: string
+}>;
+
+type RecipeShapeless = string[];
+
+type Recipe = RecipeShaped | RecipeShapeless;
+
+type Enchantment = {
+  type: keyof typeof ENCHANTMENTS
+  level?: number | string
+  short?: boolean
+};
+
+type TextRich = {
+  text: string
+  color?: typeof COLORS[number],
+  format?: typeof FORMATS[number]
+};
+
+type Text = string | TextRich;
+```
+
 ## Vanilla
 
  - `add` - Add a crafting table recipe.
@@ -184,15 +231,15 @@ Shaped crafting recipes support the following shorthand patterns, in order:
 withName('<minecraft:bread>', 'Bread');
 
 // Bread (with red text)
-withName('<minecraft:bread>', ['Bread', { colour: 'red' }]);
+withName('<minecraft:bread>', { text: 'Bread', colour: 'red' });
 
 // Bread (bold red text)
-withName('<minecraft:bread>', ['Bread', { colour: 'red', format: 'bold' }]);
+withName('<minecraft:bread>', { text: 'Bread', colour: 'red', format: 'bold' });
 
 // Bread (normal text) with butter (yellow italic text)
 withName('<minecraft:bread>', [
   'Bread',
-  ['with butter', { colour: 'yellow', format: 'italic' }]
+  { text: 'with butter', colour: 'yellow', format: 'italic' }
 ]);
 ```
 
@@ -227,10 +274,10 @@ withName('<minecraft:bread>', [
 import { exnihilo } from 'zen-flow';
 
 exnilo.addHammer('<minecraft:cobblestone>', {
-  '<minecraft:stick>': [0.5], // 50%
+  '<minecraft:stick>': 0.5, // 50%
   '<minecraft:bread>': [1, 1, 0.5] // 100%, 100%, 50%
-  '<minecraft:stone>': [[1, 2], [0.5, 1]] // 100% with 2x modifier, 50% with 1x modifier
-  '<minecraft:coal>': [[1, 2], 1] // 100% with 2x modifier, 100% 
+  '<minecraft:stone>': [{ chance: 1, modifier: 2 }, { chance: 0.5, modifier: 1 }] // 100% with 2x modifier, 50% with 1x modifier
+  '<minecraft:coal>': [{ chance: 1, modifier: 2 }, 1] // 100% with 2x modifier, 100% 
 });
 
 exnihilo.addSieve('<minecraft:cobblestone>', {
@@ -276,3 +323,5 @@ exnihilo.addSieve('<minecraft:cobblestone>', {
  - `removeTransposerFill` - Remove Fluid Transposer fill recipe
  - `addTransposerExtract` - Add Fluid Transposer extract recipe
  - `removeTransposerExtract` - Remove Fluid Transposer extract recipe
+
+<i>* All bonus properties take a number between 1 and 100</i>

package/dist/zenflow.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const createCode = (code) => `\\u00A7${code}`;
 const createFormat = (type) => (tooltip) => `format.${type}(${tooltip})`;
-const NAME_COLOUR = {
+const NAME_COLOR = {
   black: createCode("0"),
   darkBlue: createCode("1"),
   darkGreen: createCode("2"),
@@ -22,7 +22,15 @@ const NAME_COLOUR = {
   yellow: createCode("e"),
   white: createCode("f")
 };
-const TOOLTIP_COLOUR = {
+const NAME_FORMAT = {
+  obfuscated: createCode("k"),
+  bold: createCode("l"),
+  strikethrough: createCode("m"),
+  underline: createCode("n"),
+  italic: createCode("o"),
+  reset: createCode("r")
+};
+const TOOLTIP_COLOR = {
   black: createFormat("black"),
   darkBlue: createFormat("darkBlue"),
   darkGreen: createFormat("darkGreen"),
@@ -40,14 +48,6 @@ const TOOLTIP_COLOUR = {
   yellow: createFormat("yellow"),
   white: createFormat("white")
 };
-const NAME_FORMAT = {
-  obfuscated: createCode("k"),
-  bold: createCode("l"),
-  strikethrough: createCode("m"),
-  underline: createCode("n"),
-  italic: createCode("o"),
-  reset: createCode("r")
-};
 const TOOLTIP_FORMAT = {
   obfuscated: createFormat("obfuscated"),
   bold: createFormat("bold"),
@@ -98,41 +98,41 @@ const MFR_FOCI = {
   black: 15
 };
 
-const isItem = (x) => Array.isArray(x) && x.length === 2 && typeof x[0] === "string" && typeof x[1] === "number";
-const isRecipeShaped = (x) => !Array.isArray(x) && typeof x === "object";
-const isTextFormat = (x) => Array.isArray(x) && x.length === 2 && (x[1].colour || x[1].format);
+const clamp = (min, max, n) => Math.max(min, Math.min(max, n));
+const fill = (n, x) => Array.from({ length: n }).map((_, i) => x ?? i);
+const toArray = (x) => Array.isArray(x) ? x : [x];
+const isObject = (x) => typeof x === "object" && !Array.isArray(x);
 
-const formatItem = (item) => `${item[0]} * ${item[1]}`;
+const formatLiteral = (x) => `"${x}"`;
+const formatId = (id) => id ?? "null";
+const formatStack = (stack) => `${stack.id} * ${stack.n}`;
+const formatIngredient = (ingredient) => isObject(ingredient) ? formatStack(ingredient) : ingredient;
 const formatList = (list) => `[${list.join(", ")}]`;
-const formatIngredient = (ingredient) => ingredient ?? "null";
 const formatEnchantment = (enchantment) => {
   const id = `${ENCHANTMENTS[enchantment.type]}${enchantment.short ? " as short" : ""}`;
   const lvl = `${enchantment.level ?? 1}${enchantment.level ? " as short" : ""}`;
   return `{ id: ${id}, lvl: ${lvl} }`;
 };
 const formatName = (texts) => {
-  const format = (text) => [
-    text[1].colour && NAME_COLOUR[text[1].colour],
-    text[1].format && NAME_FORMAT[text[1].format],
-    text[0],
-    (text[1].colour || text[1].format) && NAME_FORMAT.reset
-  ].filter((x) => x).join("");
-  if (typeof texts === "string")
-    return `"${texts}"`;
-  if (isTextFormat(texts))
-    return `"${format(texts)}"`;
-  const formatted = texts.map((text) => typeof text === "string" ? text : format(text)).join("");
+  const formatted = toArray(texts).map((text) => {
+    if (typeof text === "string")
+      return text;
+    return [
+      text.color && NAME_COLOR[text.color],
+      text.format && NAME_FORMAT[text.format],
+      text.text,
+      (text.color || text.format) && NAME_FORMAT.reset
+    ].filter((x) => x !== void 0).join("");
+  }).join("");
   return `"${formatted}"`;
 };
-const formatTooltip = (texts) => {
-  const format = (text, options) => TOOLTIP_COLOUR[options?.colour ?? "gray"](options?.format ? TOOLTIP_FORMAT[options.format](`"${text}"`) : `"${text}"`);
-  if (!Array.isArray(texts))
-    return format(texts);
-  if (isTextFormat(texts))
-    return format(...texts);
-  return texts.map(formatTooltip).join(" + ");
-};
-const formatRecipeShaped = (recipe) => {
+const formatTooltip = (texts) => toArray(texts).map((text) => {
+  if (typeof text === "string")
+    return formatLiteral(text);
+  const format = text.format ? TOOLTIP_FORMAT[text.format](formatLiteral(text.text)) : formatLiteral(text.text);
+  return TOOLTIP_COLOR[text.color ?? "gray"](format);
+}).join(" + ");
+const formatRecipe = (recipe) => {
   const matrix = [[
     recipe.square || recipe.ring || recipe.corner || recipe[1],
     recipe.square || recipe.ring || recipe.edge || recipe[2],
@@ -145,165 +145,165 @@ const formatRecipeShaped = (recipe) => {
     recipe.ring || recipe.corner || recipe[7],
     recipe.ring || recipe.edge || recipe[8],
     recipe.ring || recipe.corner || recipe[9]
-  ]].map((row) => formatList(row.map(formatIngredient)));
+  ]].map((row) => formatList(row.map(formatId)));
   return `[
 	${matrix.join(",\n	")}
 ]`;
 };
 const formatArgs = (...args) => {
-  const list = args.filter((arg) => arg !== void 0).map((arg) => {
-    if (typeof arg === "number")
-      return `${arg}`;
-    if (isRecipeShaped(arg))
-      return formatRecipeShaped(arg);
-    if (isItem(arg))
-      return formatItem(arg);
-    if (Array.isArray(arg))
-      return formatList(arg);
-    return arg;
-  });
+  const list = args.filter((x) => x !== void 0).map((x) => Array.isArray(x) ? formatList(x) : x);
   return list.length > 3 ? `
 	${list.join(",\n	")}
 ` : list.join(", ");
 };
 
-const addCompressor = (recipe) => `mods.avaritia.Compressor.add(${formatArgs(recipe.out, recipe.in[1], recipe.in[0])});`;
-const removeCompressor = (ingredient) => `mods.avaritia.Compressor.remove(${ingredient});`;
-const addExtreme = (item, recipe) => {
-  const out = formatArgs(item, recipe.map((row) => formatArgs(row.map(formatIngredient))));
+const addCompressor = (recipe) => `mods.avaritia.Compressor.add(${formatArgs(recipe.out, recipe.in.n, recipe.in.id)});`;
+const removeCompressor = (id) => `mods.avaritia.Compressor.remove(${id});`;
+const addExtreme = (ingredient, recipe) => {
+  const out = formatArgs(formatIngredient(ingredient), recipe.map((row) => formatList(row.map(formatId))));
   return `mods.avaritia.ExtremeCrafting.addShaped(${out});`;
 };
-const removeExtreme = (ingredient) => `mods.avaritia.ExtremeCrafting.remove(${ingredient});`;
-
-const clamp = (min, max, n) => Math.max(min, Math.min(max, n));
-const fill = (n, x) => Array.from({ length: n }).map((_, i) => x ?? i);
+const removeExtreme = (id) => `mods.avaritia.ExtremeCrafting.remove(${id});`;
 
 const addComposter = (recipe) => {
-  const out = formatArgs(recipe[0], clamp(0, 1, recipe[1]), recipe[2] && `"${recipe[2]}"`);
+  const out = formatArgs(recipe.id, clamp(0, 1, recipe.fill), recipe.hex && `"${recipe.hex}"`);
   return `mods.exnihilo.Composting.addRecipe(${out});`;
 };
-const removeComposter = (ingredient) => `mods.exnihilo.Composting.removeRecipe(${ingredient});`;
-const addCrucible$1 = (recipe) => `mods.exnihilo.Crucible.addRecipe(${formatArgs(...recipe)});`;
-const removeCrucible$1 = (liquid) => `mods.exnihilo.Crucible.removeRecipe(${liquid});`;
+const removeComposter = (id) => `mods.exnihilo.Composting.removeRecipe(${id});`;
+const addCrucible$1 = (recipe) => {
+  const out = formatArgs(recipe.id, formatStack(recipe.liquid));
+  return `mods.exnihilo.Crucible.addRecipe(${out});`;
+};
+const removeCrucible$1 = (id) => `mods.exnihilo.Crucible.removeRecipe(${id});`;
 const addCrucibleSource = (recipe) => {
-  const out = formatArgs(recipe[0], clamp(0, 1, recipe[1]));
+  const out = formatArgs(recipe.id, clamp(0, 1, recipe.n));
   return `mods.exnihilo.Crucible.addHeatSource(${out});`;
 };
-const removeCrucibleSource = (ingredient) => `mods.exnihilo.Crucible.removeHeatSource(${ingredient});`;
-const addHammer = (ingredient, recipe) => {
-  const items = Object.entries(recipe).map((entry) => entry[1].map((chance) => ({
-    ingredient: entry[0],
-    chance: clamp(0, 1, Array.isArray(chance) ? chance[0] : chance),
-    modifier: Array.isArray(chance) ? chance[1] : 1
+const removeCrucibleSource = (id) => `mods.exnihilo.Crucible.removeHeatSource(${id});`;
+const addHammer = (id, recipe) => {
+  const items = Object.entries(recipe).map((entry) => toArray(entry[1]).map((chance) => ({
+    id: entry[0],
+    chance: clamp(0, 1, isObject(chance) ? chance.chance : chance),
+    modifier: isObject(chance) ? chance.modifier : 1
   }))).flat();
-  const out = formatArgs(ingredient, items.map((item) => item.ingredient), items.map((item) => item.chance), items.map((item) => item.modifier));
+  const out = formatArgs(id, items.map((item) => item.id), items.map((item) => item.chance), items.map((item) => item.modifier));
   return `mods.exnihilo.Hammer.addRecipe(${out});`;
 };
-const removeHammer = (ingredient) => `mods.exnihilo.Hammer.removeRecipe(${ingredient});`;
-const addSieve = (ingredient, recipe) => {
+const removeHammer = (id) => `mods.exnihilo.Hammer.removeRecipe(${id});`;
+const addSieve = (id, recipe) => {
   const items = Object.entries(recipe).map((entry) => fill(Math.ceil(entry[1])).map((i) => ({
-    ingredient: entry[0],
+    id: entry[0],
     chance: entry[1] - i < 1 ? Math.round(1 / (entry[1] - i)) : 1
   }))).flat();
-  const out = formatArgs(ingredient, items.map((item) => item.ingredient), items.map((item) => item.chance));
+  const out = formatArgs(id, items.map((item) => item.id), items.map((item) => item.chance));
   return `mods.exnihilo.Sieve.addRecipe(${out});`;
 };
-const removeSieve = (ingredient) => `mods.exnihilo.Sieve.removeRecipe(${ingredient});`;
+const removeSieve = (id) => `mods.exnihilo.Sieve.removeRecipe(${id});`;
 
-const addQED = (item, recipe) => `mods.extraUtils.QED.addShapedRecipe(${formatArgs(item, recipe)});`;
-const removeQED = (ingredient) => `mods.extraUtils.QED.removeRecipe(${ingredient});`;
-const replaceQED = (item, recipe) => [
-  removeQED(Array.isArray(item) ? item[0] : item),
-  addQED(item, recipe)
+const addQED = (ingredient, recipe) => {
+  const out = formatArgs(formatIngredient(ingredient), formatRecipe(recipe));
+  return `mods.extraUtils.QED.addShapedRecipe(${out});`;
+};
+const removeQED = (id) => `mods.extraUtils.QED.removeRecipe(${id});`;
+const replaceQED = (ingredient, recipe) => [
+  removeQED(Array.isArray(ingredient) ? ingredient[0] : ingredient),
+  addQED(ingredient, recipe)
 ].join("\n");
 
-const addDict = (dict, ingredients) => ingredients.map((ingredient) => `${dict}.add(${ingredient});`).join("\n");
-const removeDict = (dict, ingredients) => ingredients.map((ingredient) => `${dict}.remove(${ingredient});`).join("\n");
-const withName = (ingredient, name) => `${ingredient}.displayName = ${formatName(name)};`;
-const withTooltip = (ingredient, tooltip) => `${ingredient}.addTooltip(${formatTooltip(tooltip)});`;
-const withTooltipShift = (ingredient, tooltip) => `${ingredient}.addShiftTooltip(${formatTooltip(tooltip)});`;
-const withTag = (tag) => (ingredient) => `${ingredient}.withTag(${tag})`;
-const withEnchantments = (enchantment) => {
-  const enchantments = Array.isArray(enchantment) ? enchantment : [enchantment];
-  return withTag(`{ ench: ${formatList(enchantments.map(formatEnchantment))} }`);
-};
+const addDict = (dict, ids) => ids.map((id) => `${dict}.add(${id});`).join("\n");
+const removeDict = (dict, ids) => ids.map((id) => `${dict}.remove(${id});`).join("\n");
+const withName = (id, name) => `${id}.displayName = ${formatName(name)};`;
+const withTooltip = (id, tooltips) => toArray(tooltips).map((tooltip) => `${id}.addTooltip(${formatTooltip(tooltip)});`).join("\n");
+const withTooltipShift = (id, tooltips) => toArray(tooltips).map((tooltip) => `${id}.addShiftTooltip(${formatTooltip(tooltip)});`).join("\n");
+const withTag = (tag) => (id) => `${id}.withTag(${tag})`;
+const withEnchantment = (enchantments) => withTag(`{ ench: ${formatList(toArray(enchantments).map(formatEnchantment))} }`);
 
-const addLaser = (item) => `MiningLaser.addOre(${formatArgs(item)});`;
-const removeLaser = (ingredient) => `MiningLaser.removeOre(${ingredient});`;
-const addFoci = (lens, ingredients) => ingredients.map((ingredient) => `MiningLaser.addPreferredOre(${formatArgs(MFR_FOCI[lens], ingredient)});`).join("\n");
-const removeFoci = (lens, ingredients) => ingredients.map((ingredient) => `MiningLaser.removePreferredOre(${formatArgs(MFR_FOCI[lens], ingredient)});`).join("\n");
+const addLaser = (ingredient) => `MiningLaser.addOre(${formatArgs(formatIngredient(ingredient))});`;
+const removeLaser = (id) => `MiningLaser.removeOre(${id});`;
+const addFoci = (foci, ids) => ids.map((id) => `MiningLaser.addPreferredOre(${formatArgs(MFR_FOCI[foci], id)});`).join("\n");
+const removeFoci = (foci, ids) => ids.map((id) => `MiningLaser.removePreferredOre(${formatArgs(MFR_FOCI[foci], id)});`).join("\n");
 
-const hide = (ingredient) => `NEI.hide(${ingredient});`;
-const addNEI = (ingredient) => `NEI.addEntry(${ingredient});`;
+const hide = (id) => `NEI.hide(${id});`;
+const addNEI = (id) => `NEI.addEntry(${id});`;
 
 const addCrucible = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.liquid);
+  const out = formatArgs(recipe.rf, recipe.in, formatStack(recipe.liquid));
   return `mods.thermalexpansion.Crucible.addRecipe(${out});`;
 };
-const removeCrucible = (ingredient) => `mods.thermalexpansion.Crucible.removeRecipe(${ingredient});`;
+const removeCrucible = (id) => `mods.thermalexpansion.Crucible.removeRecipe(${id});`;
 const addFurnace$1 = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out);
+  const out = formatArgs(recipe.rf, recipe.in, formatIngredient(recipe.out));
   return `mods.thermalexpansion.Furnace.addRecipe(${out});`;
 };
-const removeFurnace$1 = (ingredient) => `mods.thermalexpansion.Furnace.removeRecipe(${ingredient});`;
+const removeFurnace$1 = (id) => `mods.thermalexpansion.Furnace.removeRecipe(${id});`;
 const addInsolator = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.left, recipe.right, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, formatIngredient(recipe.left), formatIngredient(recipe.right), formatIngredient(recipe.out), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Insolator.addRecipe(${out});`;
 };
-const removeInsolator = (left, right) => `mods.thermalexpansion.Insolator.removeRecipe(${formatArgs(left, right)});`;
+const removeInsolator = (left, right) => {
+  const out = formatArgs(formatIngredient(left), formatIngredient(right));
+  return `mods.thermalexpansion.Insolator.removeRecipe(${out});`;
+};
 const addPulverizer = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, recipe.in, formatIngredient(recipe.out), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Pulverizer.addRecipe(${out});`;
 };
-const removePulverizer = (ingredient) => `mods.thermalexpansion.Pulverizer.removeRecipe(${ingredient});`;
+const removePulverizer = (id) => `mods.thermalexpansion.Pulverizer.removeRecipe(${id});`;
 const addSawmill = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, recipe.in, formatIngredient(recipe.out), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Sawmill.addRecipe(${out});`;
 };
-const removeSawmill = (ingredient) => `mods.thermalexpansion.Sawmill.removeRecipe(${ingredient});`;
+const removeSawmill = (id) => `mods.thermalexpansion.Sawmill.removeRecipe(${id});`;
 const addSmelter = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.right, recipe.left, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, formatIngredient(recipe.right), formatIngredient(recipe.left), formatIngredient(recipe.out), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Smelter.addRecipe(${out});`;
 };
-const removeSmelter = (left, right) => `mods.thermalexpansion.Smelter.removeRecipe(${formatArgs(left, right)});`;
+const removeSmelter = (left, right) => {
+  const out = formatArgs(formatIngredient(left), formatIngredient(right));
+  return `mods.thermalexpansion.Smelter.removeRecipe(${out});`;
+};
 const addTransposerFill = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.liquid);
+  const out = formatArgs(recipe.rf, recipe.in, recipe.out, formatStack(recipe.liquid));
   return `mods.thermalexpansion.Transposer.addFillRecipe(${out});`;
 };
-const removeTransposerFill = (ingredient, liquid) => `mods.thermalexpansion.Transposer.removeFillRecipe(${formatArgs(ingredient, liquid)});`;
+const removeTransposerFill = (id, liquid) => `mods.thermalexpansion.Transposer.removeFillRecipe(${formatArgs(id, liquid)});`;
 const addTransposerExtract = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.liquid, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, recipe.in, formatStack(recipe.liquid), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Transposer.addExtractRecipe(${out});`;
 };
-const removeTransposerExtract = (ingredient) => `mods.thermalexpansion.Transposer.removeExtractRecipe(${ingredient});`;
+const removeTransposerExtract = (id) => `mods.thermalexpansion.Transposer.removeExtractRecipe(${id});`;
 
 const add = (item, recipe) => {
   const type = Array.isArray(recipe) ? "Shapeless" : "Shaped";
-  return `recipes.add${type}(${formatArgs(item, recipe)});`;
+  const out = formatArgs(formatIngredient(item), Array.isArray(recipe) ? formatList(recipe) : formatRecipe(recipe));
+  return `recipes.add${type}(${out});`;
+};
+const remove = (id) => `recipes.remove(${id});`;
+const removeShaped = (id) => `recipes.removeShaped(${id});`;
+const removeShapeless = (id) => `recipes.removeShapeless(${id});`;
+const addFurnace = (recipe) => {
+  const out = formatArgs(formatIngredient(recipe.out), recipe.in);
+  return `furnace.addRecipe(${out});`;
 };
-const remove = (ingredient) => `recipes.remove(${ingredient});`;
-const removeShaped = (ingredient) => `recipes.removeShaped(${ingredient});`;
-const removeShapeless = (ingredient) => `recipes.removeShapeless(${ingredient});`;
-const addFurnace = (recipe) => `furnace.addRecipe(${formatArgs(recipe.out, recipe.in)});`;
 const removeFurnace = (recipe) => {
   if (typeof recipe === "string")
     return `furnace.remove(<*>, ${recipe});`;
-  return `furnace.remove(${formatArgs(recipe.out, recipe.in)})`;
+  return `furnace.remove(${formatArgs(recipe.out, recipe.in)});`;
 };
-const replace = (item, recipe) => {
-  const ingredient = Array.isArray(item) ? item[0] : item;
+const replace = (ingredient, recipe) => {
+  const id = isObject(ingredient) ? ingredient.id : ingredient;
   return [
-    Array.isArray(recipe) ? removeShapeless(ingredient) : removeShaped(ingredient),
-    add(item, recipe)
+    Array.isArray(recipe) ? removeShapeless(id) : removeShaped(id),
+    add(ingredient, recipe)
   ].join("\n");
 };
-const replaceAll = (item, recipe) => [
-  remove(Array.isArray(item) ? item[0] : item),
-  add(item, recipe)
+const replaceAll = (ingredient, recipe) => [
+  remove(isObject(ingredient) ? ingredient.id : ingredient),
+  add(ingredient, recipe)
 ].join("\n");
-const replaceMany = (item, recipes) => [
-  remove(Array.isArray(item) ? item[0] : item),
-  ...recipes.map((recipe) => add(item, recipe))
+const replaceMany = (ingredient, recipes) => [
+  remove(isObject(ingredient) ? ingredient.id : ingredient),
+  ...recipes.map((recipe) => add(ingredient, recipe))
 ].join("\n");
 
 exports.add = add;
@@ -356,7 +356,7 @@ exports.replace = replace;
 exports.replaceAll = replaceAll;
 exports.replaceMany = replaceMany;
 exports.replaceQED = replaceQED;
-exports.withEnchantments = withEnchantments;
+exports.withEnchantment = withEnchantment;
 exports.withName = withName;
 exports.withTag = withTag;
 exports.withTooltip = withTooltip;

package/dist/zenflow.d.ts

@@ -1,4 +1,4 @@
-declare const COLOURS: readonly ["black", "darkBlue", "darkGreen", "darkAqua", "darkRed", "darkRed", "darkPurple", "gold", "gray", "darkGray", "blue", "green", "aqua", "red", "lightPurple", "yellow", "white"];
+declare const COLORS: readonly ["black", "darkBlue", "darkGreen", "darkAqua", "darkRed", "darkRed", "darkPurple", "gold", "gray", "darkGray", "blue", "green", "aqua", "red", "lightPurple", "yellow", "white"];
 declare const FORMATS: readonly ["obfuscated", "bold", "strikethrough", "underline", "italic"];
 declare const ENCHANTMENTS: {
     readonly protection: 0;
@@ -43,9 +43,11 @@ declare const MFR_FOCI: {
     readonly black: 15;
 };
 
-declare type Ingredients = [ingredient: string, n: number];
-declare type Item = string | Ingredients;
-declare type Bonus = [item: Item, chance: number];
+declare type Stack = {
+    id: string;
+    n: number;
+};
+declare type Ingredient = string | Stack;
 declare type RecipeShaped = Partial<{
     1: string;
     2: string;
@@ -66,18 +68,18 @@ declare type RecipeShapeless = string[];
 declare type Recipe = RecipeShaped | RecipeShapeless;
 declare type Enchantment = {
     type: keyof typeof ENCHANTMENTS;
-    level?: number;
+    level?: number | string;
     short?: boolean;
 };
-declare type TextFormatOptions = {
-    colour: typeof COLOURS[number];
-    format: typeof FORMATS[number];
+declare type TextRich = {
+    text: string;
+    color?: typeof COLORS[number];
+    format?: typeof FORMATS[number];
 };
-declare type TextFormat = [text: string, options: Partial<TextFormatOptions>];
-declare type Text = string | TextFormat;
+declare type Text = string | TextRich;
 
 declare type RecipeCompressor = {
-    in: Item;
+    in: Stack;
     out: string;
 };
 declare type RecipeExtreme = [
@@ -93,135 +95,149 @@ declare type RecipeExtreme = [
 ];
 declare const addCompressor: (recipe: RecipeCompressor) => string;
 /**
- * @param ingredient Compressor output
+ * @param id Compressor output
  */
-declare const removeCompressor: (ingredient: string) => string;
-declare const addExtreme: (item: Item, recipe: RecipeExtreme) => string;
+declare const removeCompressor: (id: string) => string;
+declare const addExtreme: (ingredient: Ingredient, recipe: RecipeExtreme) => string;
 /**
- * @param ingredient Extreme Crafting output
+ * @param id Extreme Crafting output
  */
-declare const removeExtreme: (ingredient: string) => string;
+declare const removeExtreme: (id: string) => string;
 
-declare type RecipeComposter = [
-    ingredient: string,
-    fill: number,
-    hex?: string
-];
-declare type RecipeCrucible$1 = [
-    ingredient: string,
-    liquid: Item
-];
-declare type RecipeCrucibleHeat = [
-    ingredient: string,
-    heat: number
-];
-declare type RecipeHammer = Record<string, Array<number | [n: number, mod: number]>>;
+declare type RecipeComposter = {
+    id: string;
+    fill: number;
+    hex?: string;
+};
+declare type RecipeCrucible$1 = {
+    id: string;
+    liquid: Stack;
+};
+declare type RecipeHammer = Record<string, Array<number | {
+    chance: number;
+    modifier: number;
+}>>;
 declare type RecipeSieve = Record<string, number>;
 /**
  *  - Fill must be between `0` and `1`
  */
 declare const addComposter: (recipe: RecipeComposter) => string;
-declare const removeComposter: (ingredient: string) => string;
+declare const removeComposter: (id: string) => string;
 declare const addCrucible$1: (recipe: RecipeCrucible$1) => string;
-declare const removeCrucible$1: (liquid: string) => string;
+declare const removeCrucible$1: (id: string) => string;
 /**
- * - Heat must be between `0` and `1`
+ * - `n` must be between `0` and `1`
  */
-declare const addCrucibleSource: (recipe: RecipeCrucibleHeat) => string;
-declare const removeCrucibleSource: (ingredient: string) => string;
+declare const addCrucibleSource: (recipe: Stack) => string;
+declare const removeCrucibleSource: (id: string) => string;
 /**
  * - Chance must be between `0` and `1`
  */
-declare const addHammer: (ingredient: string, recipe: RecipeHammer) => string;
-declare const removeHammer: (ingredient: string) => string;
+declare const addHammer: (id: string, recipe: RecipeHammer) => string;
+declare const removeHammer: (id: string) => string;
 /**
  * - Chance must be bigger than `0`
  */
-declare const addSieve: (ingredient: string, recipe: RecipeSieve) => string;
-declare const removeSieve: (ingredient: string) => string;
+declare const addSieve: (id: string, recipe: RecipeSieve) => string;
+declare const removeSieve: (id: string) => string;
 
-declare const addQED: (item: Item, recipe: RecipeShaped) => string;
+declare const addQED: (ingredient: Ingredient, recipe: RecipeShaped) => string;
 /**
- * @param ingredient QED output
+ * @param id QED output
  */
-declare const removeQED: (ingredient: string) => string;
-declare const replaceQED: (item: Item, recipe: RecipeShaped) => string;
+declare const removeQED: (id: string) => string;
+declare const replaceQED: (ingredient: Ingredient, recipe: RecipeShaped) => string;
 
 /**
  * @param dict Valid ore dictionary value: http://minetweaker3.powerofbytes.com/wiki/Tutorial:Ore_Dictionary
  */
-declare const addDict: (dict: string, ingredients: string[]) => string;
+declare const addDict: (dict: string, ids: string[]) => string;
 /**
 * @param dict Valid ore dictionary value: http://minetweaker3.powerofbytes.com/wiki/Tutorial:Ore_Dictionary
 */
-declare const removeDict: (dict: string, ingredients: string[]) => string;
-declare const withName: (ingredient: string, name: Text | Text[]) => string;
-declare const withTooltip: (ingredient: string, tooltip: Text | Text[]) => string;
-declare const withTooltipShift: (ingredient: string, tooltip: Text | Text[]) => string;
-declare const withTag: (tag: string) => (ingredient: string) => string;
-declare const withEnchantments: (enchantment: Enchantment | Enchantment[]) => (ingredient: string) => string;
+declare const removeDict: (dict: string, ids: string[]) => string;
+declare const withName: (id: string, name: Text) => string;
+declare const withTooltip: (id: string, tooltips: Text | Text[]) => string;
+declare const withTooltipShift: (id: string, tooltips: Text | Text[]) => string;
+declare const withTag: (tag: string) => (id: string) => string;
+declare const withEnchantment: (enchantments: Enchantment | Enchantment[]) => (id: string) => string;
 
-declare const addLaser: (item: Item) => string;
 /**
- * @param ingredient - Laser output
+ * Requires: `import mods.mfr.MiningLaser;`
  */
-declare const removeLaser: (ingredient: string) => string;
-declare const addFoci: (lens: keyof typeof MFR_FOCI, ingredients: string[]) => string;
+declare const addLaser: (ingredient: Ingredient) => string;
 /**
-* @param ingredient - Laser output
-*/
-declare const removeFoci: (lens: keyof typeof MFR_FOCI, ingredients: string[]) => string;
+ *  - Requires: `import mods.mfr.MiningLaser;`
+ *  - Accepts ore dictionary
+ * @param id - Laser output
+ */
+declare const removeLaser: (id: string) => string;
+/**
+ * Requires: `import mods.mfr.MiningLaser;`
+ */
+declare const addFoci: (foci: keyof typeof MFR_FOCI, ids: string[]) => string;
+/**
+ * Requires: `import mods.mfr.MiningLaser;`
+ * @param ids - Laser output
+ */
+declare const removeFoci: (foci: keyof typeof MFR_FOCI, ids: string[]) => string;
 
-declare const hide: (ingredient: string) => string;
-declare const addNEI: (ingredient: string) => string;
+/**
+ * Requires: `import mods.nei.NEI;`
+ */
+declare const hide: (id: string) => string;
+/**
+ * Requires: `import mods.nei.NEI;`
+ */
+declare const addNEI: (id: string) => string;
 
 declare type RecipeCrucible = {
     rf: number;
     in: string;
-    liquid: Ingredients;
+    liquid: Stack;
 };
 declare type RecipeFurnace$1 = {
     rf: number;
     in: string;
-    out: Item;
+    out: Ingredient;
 };
 declare type RecipeInsolator = {
     rf: number;
-    left: Item;
-    right: Item;
-    out: Item;
-    bonus?: Bonus;
+    left: Ingredient;
+    right: Ingredient;
+    out: Ingredient;
+    bonus?: Stack;
 };
 declare type RecipePulverizer = {
     rf: number;
     in: string;
-    out: Item;
-    bonus?: Bonus;
+    out: Ingredient;
+    bonus?: Stack;
 };
 declare type RecipeSawmill = {
     rf: number;
     in: string;
-    out: Item;
-    bonus?: Bonus;
+    out: Ingredient;
+    bonus?: Stack;
 };
 declare type RecipeSmelter = {
     rf: number;
-    left: Item;
-    right: Item;
-    out: Item;
-    bonus?: Bonus;
+    left: Ingredient;
+    right: Ingredient;
+    out: Ingredient;
+    bonus?: Stack;
 };
 declare type RecipeTransposerFill = {
     rf: number;
     in: string;
     out: string;
-    liquid: Ingredients;
+    liquid: Stack;
 };
 declare type RecipeTransposerExtract = {
     rf: number;
     in: string;
-    liquid: Ingredients;
-    bonus?: Bonus;
+    liquid: Stack;
+    bonus?: Stack;
 };
 /**
  * Common values:
@@ -230,7 +246,7 @@ declare type RecipeTransposerExtract = {
  *  - Rocks: `80.000RF ~ 320.000RF, 1000mB`
  */
 declare const addCrucible: (recipe: RecipeCrucible) => string;
-declare const removeCrucible: (ingredient: string) => string;
+declare const removeCrucible: (id: string) => string;
 /**
  * Common values:
  *  - Food: `800RF`
@@ -238,14 +254,14 @@ declare const removeCrucible: (ingredient: string) => string;
  *  - Blocks: `1600RF`
  */
 declare const addFurnace$1: (recipe: RecipeFurnace$1) => string;
-declare const removeFurnace$1: (ingredient: string) => string;
+declare const removeFurnace$1: (id: string) => string;
 /**
  * Common values:
  *  - Phyto-gro: `7200RF`
  *  - Rich phyto-gro: `9600RF`
  */
 declare const addInsolator: (recipe: RecipeInsolator) => string;
-declare const removeInsolator: (left: Item, right: Item) => string;
+declare const removeInsolator: (left: Ingredient, right: Ingredient) => string;
 /**
  * Common values:
  *  - Plants: `1600RF`
@@ -255,9 +271,9 @@ declare const removeInsolator: (left: Item, right: Item) => string;
  *  - Ores: `3200RF`
  */
 declare const addPulverizer: (recipe: RecipePulverizer) => string;
-declare const removePulverizer: (ingredient: string) => string;
+declare const removePulverizer: (id: string) => string;
 declare const addSawmill: (recipe: RecipeSawmill) => string;
-declare const removeSawmill: (ingredient: string) => string;
+declare const removeSawmill: (id: string) => string;
 /**
 * Common values (RF):
 *  - Dust: `200RF ~ 1600RF`
@@ -268,7 +284,7 @@ declare const removeSawmill: (ingredient: string) => string;
 *  - Slag: `7200RF`
 */
 declare const addSmelter: (recipe: RecipeSmelter) => string;
-declare const removeSmelter: (left: Item, right: Item) => string;
+declare const removeSmelter: (left: Ingredient, right: Ingredient) => string;
 /**
 * Common values
 *  - Duct: `800RF, 200mB`
@@ -279,18 +295,18 @@ declare const removeSmelter: (left: Item, right: Item) => string;
 *  - Frame: `16.000RF, 4000mB`
 */
 declare const addTransposerFill: (recipe: RecipeTransposerFill) => string;
-declare const removeTransposerFill: (ingredient: string, liquid: string) => string;
+declare const removeTransposerFill: (id: string, liquid: string) => string;
 /**
 * Common values
 *  - Bucket: `800RF, 1000mB`
 *  - Bottle: `1600RF, 1000mB`
 */
 declare const addTransposerExtract: (recipe: RecipeTransposerExtract) => string;
-declare const removeTransposerExtract: (ingredient: string) => string;
+declare const removeTransposerExtract: (id: string) => string;
 
 declare type RecipeFurnace = {
     in: string;
-    out: Item;
+    out: Ingredient;
 };
 /**
  * Add crafting recipe
@@ -298,19 +314,19 @@ declare type RecipeFurnace = {
  * - Recipe: `{}` => Shaped recipe
  * - Recipe: `[]` => Shapeless recipe
  */
-declare const add: (item: Item, recipe: Recipe) => string;
+declare const add: (item: Ingredient, recipe: Recipe) => string;
 /**
  * Remove all crafting recipes (shaped & shapeless)
  */
-declare const remove: (ingredient: string) => string;
+declare const remove: (id: string) => string;
 /**
 * Remove all shaped crafting recipes
 */
-declare const removeShaped: (ingredient: string) => string;
+declare const removeShaped: (id: string) => string;
 /**
 * Remove all shapeless crafting recipes
 */
-declare const removeShapeless: (ingredient: string) => string;
+declare const removeShapeless: (id: string) => string;
 declare const addFurnace: (recipe: RecipeFurnace) => string;
 /**
  * Remove furnace recipe
@@ -328,11 +344,11 @@ declare const removeFurnace: (recipe: string | {
  * - Recipe: `{}` => Replaces all shaped recipes
  * - Recipe: `[]` => Replaces all shapeless recipes
  */
-declare const replace: (item: Item, recipe: Recipe) => string;
+declare const replace: (ingredient: Ingredient, recipe: Recipe) => string;
 /**
  * Replace all crafting recipe
  */
-declare const replaceAll: (item: Item, recipe: Recipe) => string;
-declare const replaceMany: (item: Item, recipes: Recipe[]) => string;
+declare const replaceAll: (ingredient: Ingredient, recipe: Recipe) => string;
+declare const replaceMany: (ingredient: Ingredient, recipes: Recipe[]) => string;
 
-export { Bonus, Enchantment, Ingredients, Item, Recipe, RecipeShaped, RecipeShapeless, Text, TextFormat, TextFormatOptions, add, addComposter, addCompressor, addCrucible$1 as addCrucibleNihilo, addCrucibleSource, addCrucible as addCrucibleThermal, addDict, addExtreme, addFoci, addFurnace, addFurnace$1 as addFurnaceThermal, addHammer, addInsolator, addLaser, addNEI, addPulverizer, addQED, addSawmill, addSieve, addSmelter, addTransposerExtract, addTransposerFill, hide, remove, removeComposter, removeCompressor, removeCrucible$1 as removeCrucibleNihilo, removeCrucibleSource, removeCrucible as removeCrucibleThermal, removeDict, removeExtreme, removeFoci, removeFurnace, removeFurnace$1 as removeFurnaceThermal, removeHammer, removeInsolator, removeLaser, removePulverizer, removeQED, removeSawmill, removeShaped, removeShapeless, removeSieve, removeSmelter, removeTransposerExtract, removeTransposerFill, replace, replaceAll, replaceMany, replaceQED, withEnchantments, withName, withTag, withTooltip, withTooltipShift };
+export { Enchantment, Ingredient, Recipe, RecipeShaped, RecipeShapeless, Stack, Text, TextRich, add, addComposter, addCompressor, addCrucible$1 as addCrucibleNihilo, addCrucibleSource, addCrucible as addCrucibleThermal, addDict, addExtreme, addFoci, addFurnace, addFurnace$1 as addFurnaceThermal, addHammer, addInsolator, addLaser, addNEI, addPulverizer, addQED, addSawmill, addSieve, addSmelter, addTransposerExtract, addTransposerFill, hide, remove, removeComposter, removeCompressor, removeCrucible$1 as removeCrucibleNihilo, removeCrucibleSource, removeCrucible as removeCrucibleThermal, removeDict, removeExtreme, removeFoci, removeFurnace, removeFurnace$1 as removeFurnaceThermal, removeHammer, removeInsolator, removeLaser, removePulverizer, removeQED, removeSawmill, removeShaped, removeShapeless, removeSieve, removeSmelter, removeTransposerExtract, removeTransposerFill, replace, replaceAll, replaceMany, replaceQED, withEnchantment, withName, withTag, withTooltip, withTooltipShift };

package/dist/zenflow.mjs

@@ -1,6 +1,6 @@
 const createCode = (code) => `\\u00A7${code}`;
 const createFormat = (type) => (tooltip) => `format.${type}(${tooltip})`;
-const NAME_COLOUR = {
+const NAME_COLOR = {
   black: createCode("0"),
   darkBlue: createCode("1"),
   darkGreen: createCode("2"),
@@ -18,7 +18,15 @@ const NAME_COLOUR = {
   yellow: createCode("e"),
   white: createCode("f")
 };
-const TOOLTIP_COLOUR = {
+const NAME_FORMAT = {
+  obfuscated: createCode("k"),
+  bold: createCode("l"),
+  strikethrough: createCode("m"),
+  underline: createCode("n"),
+  italic: createCode("o"),
+  reset: createCode("r")
+};
+const TOOLTIP_COLOR = {
   black: createFormat("black"),
   darkBlue: createFormat("darkBlue"),
   darkGreen: createFormat("darkGreen"),
@@ -36,14 +44,6 @@ const TOOLTIP_COLOUR = {
   yellow: createFormat("yellow"),
   white: createFormat("white")
 };
-const NAME_FORMAT = {
-  obfuscated: createCode("k"),
-  bold: createCode("l"),
-  strikethrough: createCode("m"),
-  underline: createCode("n"),
-  italic: createCode("o"),
-  reset: createCode("r")
-};
 const TOOLTIP_FORMAT = {
   obfuscated: createFormat("obfuscated"),
   bold: createFormat("bold"),
@@ -94,41 +94,41 @@ const MFR_FOCI = {
   black: 15
 };
 
-const isItem = (x) => Array.isArray(x) && x.length === 2 && typeof x[0] === "string" && typeof x[1] === "number";
-const isRecipeShaped = (x) => !Array.isArray(x) && typeof x === "object";
-const isTextFormat = (x) => Array.isArray(x) && x.length === 2 && (x[1].colour || x[1].format);
+const clamp = (min, max, n) => Math.max(min, Math.min(max, n));
+const fill = (n, x) => Array.from({ length: n }).map((_, i) => x ?? i);
+const toArray = (x) => Array.isArray(x) ? x : [x];
+const isObject = (x) => typeof x === "object" && !Array.isArray(x);
 
-const formatItem = (item) => `${item[0]} * ${item[1]}`;
+const formatLiteral = (x) => `"${x}"`;
+const formatId = (id) => id ?? "null";
+const formatStack = (stack) => `${stack.id} * ${stack.n}`;
+const formatIngredient = (ingredient) => isObject(ingredient) ? formatStack(ingredient) : ingredient;
 const formatList = (list) => `[${list.join(", ")}]`;
-const formatIngredient = (ingredient) => ingredient ?? "null";
 const formatEnchantment = (enchantment) => {
   const id = `${ENCHANTMENTS[enchantment.type]}${enchantment.short ? " as short" : ""}`;
   const lvl = `${enchantment.level ?? 1}${enchantment.level ? " as short" : ""}`;
   return `{ id: ${id}, lvl: ${lvl} }`;
 };
 const formatName = (texts) => {
-  const format = (text) => [
-    text[1].colour && NAME_COLOUR[text[1].colour],
-    text[1].format && NAME_FORMAT[text[1].format],
-    text[0],
-    (text[1].colour || text[1].format) && NAME_FORMAT.reset
-  ].filter((x) => x).join("");
-  if (typeof texts === "string")
-    return `"${texts}"`;
-  if (isTextFormat(texts))
-    return `"${format(texts)}"`;
-  const formatted = texts.map((text) => typeof text === "string" ? text : format(text)).join("");
+  const formatted = toArray(texts).map((text) => {
+    if (typeof text === "string")
+      return text;
+    return [
+      text.color && NAME_COLOR[text.color],
+      text.format && NAME_FORMAT[text.format],
+      text.text,
+      (text.color || text.format) && NAME_FORMAT.reset
+    ].filter((x) => x !== void 0).join("");
+  }).join("");
   return `"${formatted}"`;
 };
-const formatTooltip = (texts) => {
-  const format = (text, options) => TOOLTIP_COLOUR[options?.colour ?? "gray"](options?.format ? TOOLTIP_FORMAT[options.format](`"${text}"`) : `"${text}"`);
-  if (!Array.isArray(texts))
-    return format(texts);
-  if (isTextFormat(texts))
-    return format(...texts);
-  return texts.map(formatTooltip).join(" + ");
-};
-const formatRecipeShaped = (recipe) => {
+const formatTooltip = (texts) => toArray(texts).map((text) => {
+  if (typeof text === "string")
+    return formatLiteral(text);
+  const format = text.format ? TOOLTIP_FORMAT[text.format](formatLiteral(text.text)) : formatLiteral(text.text);
+  return TOOLTIP_COLOR[text.color ?? "gray"](format);
+}).join(" + ");
+const formatRecipe = (recipe) => {
   const matrix = [[
     recipe.square || recipe.ring || recipe.corner || recipe[1],
     recipe.square || recipe.ring || recipe.edge || recipe[2],
@@ -141,165 +141,165 @@ const formatRecipeShaped = (recipe) => {
     recipe.ring || recipe.corner || recipe[7],
     recipe.ring || recipe.edge || recipe[8],
     recipe.ring || recipe.corner || recipe[9]
-  ]].map((row) => formatList(row.map(formatIngredient)));
+  ]].map((row) => formatList(row.map(formatId)));
   return `[
 	${matrix.join(",\n	")}
 ]`;
 };
 const formatArgs = (...args) => {
-  const list = args.filter((arg) => arg !== void 0).map((arg) => {
-    if (typeof arg === "number")
-      return `${arg}`;
-    if (isRecipeShaped(arg))
-      return formatRecipeShaped(arg);
-    if (isItem(arg))
-      return formatItem(arg);
-    if (Array.isArray(arg))
-      return formatList(arg);
-    return arg;
-  });
+  const list = args.filter((x) => x !== void 0).map((x) => Array.isArray(x) ? formatList(x) : x);
   return list.length > 3 ? `
 	${list.join(",\n	")}
 ` : list.join(", ");
 };
 
-const addCompressor = (recipe) => `mods.avaritia.Compressor.add(${formatArgs(recipe.out, recipe.in[1], recipe.in[0])});`;
-const removeCompressor = (ingredient) => `mods.avaritia.Compressor.remove(${ingredient});`;
-const addExtreme = (item, recipe) => {
-  const out = formatArgs(item, recipe.map((row) => formatArgs(row.map(formatIngredient))));
+const addCompressor = (recipe) => `mods.avaritia.Compressor.add(${formatArgs(recipe.out, recipe.in.n, recipe.in.id)});`;
+const removeCompressor = (id) => `mods.avaritia.Compressor.remove(${id});`;
+const addExtreme = (ingredient, recipe) => {
+  const out = formatArgs(formatIngredient(ingredient), recipe.map((row) => formatList(row.map(formatId))));
   return `mods.avaritia.ExtremeCrafting.addShaped(${out});`;
 };
-const removeExtreme = (ingredient) => `mods.avaritia.ExtremeCrafting.remove(${ingredient});`;
-
-const clamp = (min, max, n) => Math.max(min, Math.min(max, n));
-const fill = (n, x) => Array.from({ length: n }).map((_, i) => x ?? i);
+const removeExtreme = (id) => `mods.avaritia.ExtremeCrafting.remove(${id});`;
 
 const addComposter = (recipe) => {
-  const out = formatArgs(recipe[0], clamp(0, 1, recipe[1]), recipe[2] && `"${recipe[2]}"`);
+  const out = formatArgs(recipe.id, clamp(0, 1, recipe.fill), recipe.hex && `"${recipe.hex}"`);
   return `mods.exnihilo.Composting.addRecipe(${out});`;
 };
-const removeComposter = (ingredient) => `mods.exnihilo.Composting.removeRecipe(${ingredient});`;
-const addCrucible$1 = (recipe) => `mods.exnihilo.Crucible.addRecipe(${formatArgs(...recipe)});`;
-const removeCrucible$1 = (liquid) => `mods.exnihilo.Crucible.removeRecipe(${liquid});`;
+const removeComposter = (id) => `mods.exnihilo.Composting.removeRecipe(${id});`;
+const addCrucible$1 = (recipe) => {
+  const out = formatArgs(recipe.id, formatStack(recipe.liquid));
+  return `mods.exnihilo.Crucible.addRecipe(${out});`;
+};
+const removeCrucible$1 = (id) => `mods.exnihilo.Crucible.removeRecipe(${id});`;
 const addCrucibleSource = (recipe) => {
-  const out = formatArgs(recipe[0], clamp(0, 1, recipe[1]));
+  const out = formatArgs(recipe.id, clamp(0, 1, recipe.n));
   return `mods.exnihilo.Crucible.addHeatSource(${out});`;
 };
-const removeCrucibleSource = (ingredient) => `mods.exnihilo.Crucible.removeHeatSource(${ingredient});`;
-const addHammer = (ingredient, recipe) => {
-  const items = Object.entries(recipe).map((entry) => entry[1].map((chance) => ({
-    ingredient: entry[0],
-    chance: clamp(0, 1, Array.isArray(chance) ? chance[0] : chance),
-    modifier: Array.isArray(chance) ? chance[1] : 1
+const removeCrucibleSource = (id) => `mods.exnihilo.Crucible.removeHeatSource(${id});`;
+const addHammer = (id, recipe) => {
+  const items = Object.entries(recipe).map((entry) => toArray(entry[1]).map((chance) => ({
+    id: entry[0],
+    chance: clamp(0, 1, isObject(chance) ? chance.chance : chance),
+    modifier: isObject(chance) ? chance.modifier : 1
   }))).flat();
-  const out = formatArgs(ingredient, items.map((item) => item.ingredient), items.map((item) => item.chance), items.map((item) => item.modifier));
+  const out = formatArgs(id, items.map((item) => item.id), items.map((item) => item.chance), items.map((item) => item.modifier));
   return `mods.exnihilo.Hammer.addRecipe(${out});`;
 };
-const removeHammer = (ingredient) => `mods.exnihilo.Hammer.removeRecipe(${ingredient});`;
-const addSieve = (ingredient, recipe) => {
+const removeHammer = (id) => `mods.exnihilo.Hammer.removeRecipe(${id});`;
+const addSieve = (id, recipe) => {
   const items = Object.entries(recipe).map((entry) => fill(Math.ceil(entry[1])).map((i) => ({
-    ingredient: entry[0],
+    id: entry[0],
     chance: entry[1] - i < 1 ? Math.round(1 / (entry[1] - i)) : 1
   }))).flat();
-  const out = formatArgs(ingredient, items.map((item) => item.ingredient), items.map((item) => item.chance));
+  const out = formatArgs(id, items.map((item) => item.id), items.map((item) => item.chance));
   return `mods.exnihilo.Sieve.addRecipe(${out});`;
 };
-const removeSieve = (ingredient) => `mods.exnihilo.Sieve.removeRecipe(${ingredient});`;
+const removeSieve = (id) => `mods.exnihilo.Sieve.removeRecipe(${id});`;
 
-const addQED = (item, recipe) => `mods.extraUtils.QED.addShapedRecipe(${formatArgs(item, recipe)});`;
-const removeQED = (ingredient) => `mods.extraUtils.QED.removeRecipe(${ingredient});`;
-const replaceQED = (item, recipe) => [
-  removeQED(Array.isArray(item) ? item[0] : item),
-  addQED(item, recipe)
+const addQED = (ingredient, recipe) => {
+  const out = formatArgs(formatIngredient(ingredient), formatRecipe(recipe));
+  return `mods.extraUtils.QED.addShapedRecipe(${out});`;
+};
+const removeQED = (id) => `mods.extraUtils.QED.removeRecipe(${id});`;
+const replaceQED = (ingredient, recipe) => [
+  removeQED(Array.isArray(ingredient) ? ingredient[0] : ingredient),
+  addQED(ingredient, recipe)
 ].join("\n");
 
-const addDict = (dict, ingredients) => ingredients.map((ingredient) => `${dict}.add(${ingredient});`).join("\n");
-const removeDict = (dict, ingredients) => ingredients.map((ingredient) => `${dict}.remove(${ingredient});`).join("\n");
-const withName = (ingredient, name) => `${ingredient}.displayName = ${formatName(name)};`;
-const withTooltip = (ingredient, tooltip) => `${ingredient}.addTooltip(${formatTooltip(tooltip)});`;
-const withTooltipShift = (ingredient, tooltip) => `${ingredient}.addShiftTooltip(${formatTooltip(tooltip)});`;
-const withTag = (tag) => (ingredient) => `${ingredient}.withTag(${tag})`;
-const withEnchantments = (enchantment) => {
-  const enchantments = Array.isArray(enchantment) ? enchantment : [enchantment];
-  return withTag(`{ ench: ${formatList(enchantments.map(formatEnchantment))} }`);
-};
+const addDict = (dict, ids) => ids.map((id) => `${dict}.add(${id});`).join("\n");
+const removeDict = (dict, ids) => ids.map((id) => `${dict}.remove(${id});`).join("\n");
+const withName = (id, name) => `${id}.displayName = ${formatName(name)};`;
+const withTooltip = (id, tooltips) => toArray(tooltips).map((tooltip) => `${id}.addTooltip(${formatTooltip(tooltip)});`).join("\n");
+const withTooltipShift = (id, tooltips) => toArray(tooltips).map((tooltip) => `${id}.addShiftTooltip(${formatTooltip(tooltip)});`).join("\n");
+const withTag = (tag) => (id) => `${id}.withTag(${tag})`;
+const withEnchantment = (enchantments) => withTag(`{ ench: ${formatList(toArray(enchantments).map(formatEnchantment))} }`);
 
-const addLaser = (item) => `MiningLaser.addOre(${formatArgs(item)});`;
-const removeLaser = (ingredient) => `MiningLaser.removeOre(${ingredient});`;
-const addFoci = (lens, ingredients) => ingredients.map((ingredient) => `MiningLaser.addPreferredOre(${formatArgs(MFR_FOCI[lens], ingredient)});`).join("\n");
-const removeFoci = (lens, ingredients) => ingredients.map((ingredient) => `MiningLaser.removePreferredOre(${formatArgs(MFR_FOCI[lens], ingredient)});`).join("\n");
+const addLaser = (ingredient) => `MiningLaser.addOre(${formatArgs(formatIngredient(ingredient))});`;
+const removeLaser = (id) => `MiningLaser.removeOre(${id});`;
+const addFoci = (foci, ids) => ids.map((id) => `MiningLaser.addPreferredOre(${formatArgs(MFR_FOCI[foci], id)});`).join("\n");
+const removeFoci = (foci, ids) => ids.map((id) => `MiningLaser.removePreferredOre(${formatArgs(MFR_FOCI[foci], id)});`).join("\n");
 
-const hide = (ingredient) => `NEI.hide(${ingredient});`;
-const addNEI = (ingredient) => `NEI.addEntry(${ingredient});`;
+const hide = (id) => `NEI.hide(${id});`;
+const addNEI = (id) => `NEI.addEntry(${id});`;
 
 const addCrucible = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.liquid);
+  const out = formatArgs(recipe.rf, recipe.in, formatStack(recipe.liquid));
   return `mods.thermalexpansion.Crucible.addRecipe(${out});`;
 };
-const removeCrucible = (ingredient) => `mods.thermalexpansion.Crucible.removeRecipe(${ingredient});`;
+const removeCrucible = (id) => `mods.thermalexpansion.Crucible.removeRecipe(${id});`;
 const addFurnace$1 = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out);
+  const out = formatArgs(recipe.rf, recipe.in, formatIngredient(recipe.out));
   return `mods.thermalexpansion.Furnace.addRecipe(${out});`;
 };
-const removeFurnace$1 = (ingredient) => `mods.thermalexpansion.Furnace.removeRecipe(${ingredient});`;
+const removeFurnace$1 = (id) => `mods.thermalexpansion.Furnace.removeRecipe(${id});`;
 const addInsolator = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.left, recipe.right, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, formatIngredient(recipe.left), formatIngredient(recipe.right), formatIngredient(recipe.out), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Insolator.addRecipe(${out});`;
 };
-const removeInsolator = (left, right) => `mods.thermalexpansion.Insolator.removeRecipe(${formatArgs(left, right)});`;
+const removeInsolator = (left, right) => {
+  const out = formatArgs(formatIngredient(left), formatIngredient(right));
+  return `mods.thermalexpansion.Insolator.removeRecipe(${out});`;
+};
 const addPulverizer = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, recipe.in, formatIngredient(recipe.out), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Pulverizer.addRecipe(${out});`;
 };
-const removePulverizer = (ingredient) => `mods.thermalexpansion.Pulverizer.removeRecipe(${ingredient});`;
+const removePulverizer = (id) => `mods.thermalexpansion.Pulverizer.removeRecipe(${id});`;
 const addSawmill = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, recipe.in, formatIngredient(recipe.out), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Sawmill.addRecipe(${out});`;
 };
-const removeSawmill = (ingredient) => `mods.thermalexpansion.Sawmill.removeRecipe(${ingredient});`;
+const removeSawmill = (id) => `mods.thermalexpansion.Sawmill.removeRecipe(${id});`;
 const addSmelter = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.right, recipe.left, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, formatIngredient(recipe.right), formatIngredient(recipe.left), formatIngredient(recipe.out), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Smelter.addRecipe(${out});`;
 };
-const removeSmelter = (left, right) => `mods.thermalexpansion.Smelter.removeRecipe(${formatArgs(left, right)});`;
+const removeSmelter = (left, right) => {
+  const out = formatArgs(formatIngredient(left), formatIngredient(right));
+  return `mods.thermalexpansion.Smelter.removeRecipe(${out});`;
+};
 const addTransposerFill = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.liquid);
+  const out = formatArgs(recipe.rf, recipe.in, recipe.out, formatStack(recipe.liquid));
   return `mods.thermalexpansion.Transposer.addFillRecipe(${out});`;
 };
-const removeTransposerFill = (ingredient, liquid) => `mods.thermalexpansion.Transposer.removeFillRecipe(${formatArgs(ingredient, liquid)});`;
+const removeTransposerFill = (id, liquid) => `mods.thermalexpansion.Transposer.removeFillRecipe(${formatArgs(id, liquid)});`;
 const addTransposerExtract = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.liquid, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
+  const out = formatArgs(recipe.rf, recipe.in, formatStack(recipe.liquid), recipe.bonus && recipe.bonus.id, recipe.bonus && recipe.bonus.n);
   return `mods.thermalexpansion.Transposer.addExtractRecipe(${out});`;
 };
-const removeTransposerExtract = (ingredient) => `mods.thermalexpansion.Transposer.removeExtractRecipe(${ingredient});`;
+const removeTransposerExtract = (id) => `mods.thermalexpansion.Transposer.removeExtractRecipe(${id});`;
 
 const add = (item, recipe) => {
   const type = Array.isArray(recipe) ? "Shapeless" : "Shaped";
-  return `recipes.add${type}(${formatArgs(item, recipe)});`;
+  const out = formatArgs(formatIngredient(item), Array.isArray(recipe) ? formatList(recipe) : formatRecipe(recipe));
+  return `recipes.add${type}(${out});`;
+};
+const remove = (id) => `recipes.remove(${id});`;
+const removeShaped = (id) => `recipes.removeShaped(${id});`;
+const removeShapeless = (id) => `recipes.removeShapeless(${id});`;
+const addFurnace = (recipe) => {
+  const out = formatArgs(formatIngredient(recipe.out), recipe.in);
+  return `furnace.addRecipe(${out});`;
 };
-const remove = (ingredient) => `recipes.remove(${ingredient});`;
-const removeShaped = (ingredient) => `recipes.removeShaped(${ingredient});`;
-const removeShapeless = (ingredient) => `recipes.removeShapeless(${ingredient});`;
-const addFurnace = (recipe) => `furnace.addRecipe(${formatArgs(recipe.out, recipe.in)});`;
 const removeFurnace = (recipe) => {
   if (typeof recipe === "string")
     return `furnace.remove(<*>, ${recipe});`;
-  return `furnace.remove(${formatArgs(recipe.out, recipe.in)})`;
+  return `furnace.remove(${formatArgs(recipe.out, recipe.in)});`;
 };
-const replace = (item, recipe) => {
-  const ingredient = Array.isArray(item) ? item[0] : item;
+const replace = (ingredient, recipe) => {
+  const id = isObject(ingredient) ? ingredient.id : ingredient;
   return [
-    Array.isArray(recipe) ? removeShapeless(ingredient) : removeShaped(ingredient),
-    add(item, recipe)
+    Array.isArray(recipe) ? removeShapeless(id) : removeShaped(id),
+    add(ingredient, recipe)
   ].join("\n");
 };
-const replaceAll = (item, recipe) => [
-  remove(Array.isArray(item) ? item[0] : item),
-  add(item, recipe)
+const replaceAll = (ingredient, recipe) => [
+  remove(isObject(ingredient) ? ingredient.id : ingredient),
+  add(ingredient, recipe)
 ].join("\n");
-const replaceMany = (item, recipes) => [
-  remove(Array.isArray(item) ? item[0] : item),
-  ...recipes.map((recipe) => add(item, recipe))
+const replaceMany = (ingredient, recipes) => [
+  remove(isObject(ingredient) ? ingredient.id : ingredient),
+  ...recipes.map((recipe) => add(ingredient, recipe))
 ].join("\n");
 
-export { add, addComposter, addCompressor, addCrucible$1 as addCrucibleNihilo, addCrucibleSource, addCrucible as addCrucibleThermal, addDict, addExtreme, addFoci, addFurnace, addFurnace$1 as addFurnaceThermal, addHammer, addInsolator, addLaser, addNEI, addPulverizer, addQED, addSawmill, addSieve, addSmelter, addTransposerExtract, addTransposerFill, hide, remove, removeComposter, removeCompressor, removeCrucible$1 as removeCrucibleNihilo, removeCrucibleSource, removeCrucible as removeCrucibleThermal, removeDict, removeExtreme, removeFoci, removeFurnace, removeFurnace$1 as removeFurnaceThermal, removeHammer, removeInsolator, removeLaser, removePulverizer, removeQED, removeSawmill, removeShaped, removeShapeless, removeSieve, removeSmelter, removeTransposerExtract, removeTransposerFill, replace, replaceAll, replaceMany, replaceQED, withEnchantments, withName, withTag, withTooltip, withTooltipShift };
+export { add, addComposter, addCompressor, addCrucible$1 as addCrucibleNihilo, addCrucibleSource, addCrucible as addCrucibleThermal, addDict, addExtreme, addFoci, addFurnace, addFurnace$1 as addFurnaceThermal, addHammer, addInsolator, addLaser, addNEI, addPulverizer, addQED, addSawmill, addSieve, addSmelter, addTransposerExtract, addTransposerFill, hide, remove, removeComposter, removeCompressor, removeCrucible$1 as removeCrucibleNihilo, removeCrucibleSource, removeCrucible as removeCrucibleThermal, removeDict, removeExtreme, removeFoci, removeFurnace, removeFurnace$1 as removeFurnaceThermal, removeHammer, removeInsolator, removeLaser, removePulverizer, removeQED, removeSawmill, removeShaped, removeShapeless, removeSieve, removeSmelter, removeTransposerExtract, removeTransposerFill, replace, replaceAll, replaceMany, replaceQED, withEnchantment, withName, withTag, withTooltip, withTooltipShift };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-flow",
-  "version": "1.15.0",
+  "version": "2.0.2",
   "description": "MineTweaker ZenScript made easy.",
   "main": "dist/zenflow.cjs",
   "module": "dist/zenflow.mjs",