zen-flow 1.2.1 → 1.3.0

package/README.md

@@ -89,6 +89,7 @@ Array.from({ length: 11 })
 
  - MineCraft
    - [Vanilla](#vanilla)
+      - [Crafting patterns](#craftingpatterns)
    - [Items](#items)
       - [Formatting](#formatting)
  - Mods
@@ -113,6 +114,50 @@ Array.from({ length: 11 })
  - `addFurnace` - Adds furnace recipe
  - `removeFurnace` - Removes furnace recipe
 
+### Crafting patterns
+
+Shaped crafting recipes support the following shorthand patterns:
+
+<b>Default</b>
+
+```TypeScript
+[
+  [1, 2, 3],
+  [4, 5, 6],
+  [7, 8, 9]
+]
+```
+
+<b>Square</b>
+
+```TypeScript
+[
+  [square, square, null],
+  [square, square, null],
+  [null, null, null]
+]
+```
+
+<b>Ring</b>
+
+```TypeScript
+[
+  [ring, ring, ring],
+  [ring, center, ring],
+  [ring, ring, ring]
+]
+```
+
+<b>Edge / Corner</b>
+
+```TypeScript
+[
+  [corner, edge, corner],
+  [edge, center, edge],
+  [corner, edge, corner]
+]
+```
+
 ## Items
  
  - `withName` - Change item name
@@ -157,8 +202,8 @@ withName('<minecraft:bread>', [
  - `addComposter` - Add item that can be composted to dirt
     - `fill` must be a value between `0` and `1`
  - `removeComposter` - Remove item that can be composted to dirt
- - `addCrucible` - Add crucible recipe
- - `removeCrucible` - Remove crucible recipe
+ - `addCrucibleNihilo` - Add crucible recipe
+ - `removeCrucibleNihilo` - Remove crucible recipe
  - `addCrucibleSource` - Add crucible heat source
      - `heat` must be a value between `0` and `1`
  - `removeCrucibleSource` - Remove crucible heat source
@@ -204,14 +249,14 @@ exnihilo.addSieve('<minecraft:cobblestone>', {
 ## NEI
 
  - `hide` - Hide item from NEI
- - `add` - Add item to NEI
+ - `addNEI` - Add item to NEI
 
 ## ThermalExpansion
 
- - `addCrucible` - Add Magma Crucible recipe
- - `removeCrucible` - Remove Magma Crucible recipe
- - `addFurnace` - Add Redstone Furnace recipe
- - `removeFurnace` - Remove Redstone Furnace recipe
+ - `addCrucibleThermal` - Add Magma Crucible recipe
+ - `removeCrucibleThermal` - Remove Magma Crucible recipe
+ - `addFurnaceThermal` - Add Redstone Furnace recipe
+ - `removeFurnaceThermal` - Remove Redstone Furnace recipe
  - `addInsolator` - Add Phytogenic Insolator recipe
  - `removeInsolator` - Remove Phytogenic Insolator recipe
  - `addPulverizer` - Add Pulverizer recipe

package/dist/zenflow.cjs

@@ -125,11 +125,26 @@ const formatTooltip = (texts) => {
   return texts.map(formatTooltip).join(" + ");
 };
 const formatRecipeShaped = (recipe) => {
-  const matrix = [
-    [recipe.corner || recipe[1], recipe.edge || recipe[2], recipe.corner || recipe[3]],
-    [recipe.edge || recipe[4], recipe.center || recipe[5], recipe.edge || recipe[6]],
-    [recipe.corner || recipe[7], recipe.edge || recipe[8], recipe.corner || recipe[9]]
-  ].map((row) => formatList(row.map(formatIngredient)));
+  const getSlot = (slot, patterns) => {
+    for (let i = 0; i < patterns.length; i += 1) {
+      if (patterns[i] in recipe)
+        return recipe[patterns[i]];
+    }
+    return recipe[slot];
+  };
+  const matrix = [[
+    getSlot(1, ["corner", "ring", "square"]),
+    getSlot(2, ["edge", "ring", "square"]),
+    getSlot(3, ["corner", "ring"])
+  ], [
+    getSlot(4, ["edge", "ring", "square"]),
+    getSlot(5, ["center", "square"]),
+    getSlot(6, ["edge", "ring"])
+  ], [
+    getSlot(7, ["corner", "ring"]),
+    getSlot(8, ["edge", "ring"]),
+    getSlot(9, ["corner", "ring"])
+  ]].map((row) => formatList(row.map(formatIngredient)));
   return `[
 	${matrix.join(",\n	")}
 ]`;
@@ -159,14 +174,6 @@ const addExtreme = (item, recipe) => {
 };
 const removeExtreme = (ingredient) => `mods.avaritia.ExtremeCrafting.remove(${ingredient});`;
 
-var avaritia = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addCompressor: addCompressor,
-  removeCompressor: removeCompressor,
-  addExtreme: addExtreme,
-  removeExtreme: removeExtreme
-});
-
 const clamp = (min, max, n) => Math.max(min, Math.min(max, n));
 const fill = (n, x) => Array.from({ length: n }).map((_, i) => x ?? i);
 
@@ -202,65 +209,22 @@ const addSieve = (ingredient, recipe) => {
 };
 const removeSieve = (ingredient) => `mods.exnihilo.Sieve.removeRecipe(${ingredient});`;
 
-var exNihilo = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addComposter: addComposter,
-  removeComposter: removeComposter,
-  addCrucible: addCrucible$1,
-  removeCrucible: removeCrucible$1,
-  addCrucibleSource: addCrucibleSource,
-  removeCrucibleSource: removeCrucibleSource,
-  addHammer: addHammer,
-  removeHammer: removeHammer,
-  addSieve: addSieve,
-  removeSieve: removeSieve
-});
-
 const addQED = (item, recipe) => `mods.extraUtils.QED.addShapedRecipe(${formatArgs(item, recipe)});`;
 const removeQED = (ingredient) => `mods.extraUtils.QED.removeRecipe(${ingredient});`;
 
-var extraUtilities = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addQED: addQED,
-  removeQED: removeQED
-});
-
 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 = (enchantments) => withTag(`{ ench: ${formatList(enchantments.map(formatEnchantment))} }`);
 
-var items = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  withName: withName,
-  withTooltip: withTooltip,
-  withTooltipShift: withTooltipShift,
-  withTag: withTag,
-  withEnchantments: withEnchantments
-});
-
-const hide = (ingredient) => `NEI.hide(${ingredient});`;
-const add$1 = (ingredient) => `NEI.addEntry(${ingredient});`;
-
-var nei = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  hide: hide,
-  add: add$1
-});
-
 const addLaser = (item) => `MiningLaser.addOre(${formatArgs(item)});`;
 const removeLaser = (ingredient) => `MiningLaser.removeOre(${ingredient});`;
 const addLaserPreferred = (lens, ingredients) => ingredients.map((ingredient) => `MiningLaser.addPreferredOre(${formatArgs(MFR_LASER_LENSES[lens], ingredient)});`).join("\n");
-const removedLaserPreferred = (lens, ingredient) => `MiningLaser.removePreferredOre(${formatArgs(MFR_LASER_LENSES[lens], ingredient)});`;
+const removeLaserPreferred = (lens, ingredient) => `MiningLaser.removePreferredOre(${formatArgs(MFR_LASER_LENSES[lens], ingredient)});`;
 
-var mineFactoryReloaded = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addLaser: addLaser,
-  removeLaser: removeLaser,
-  addLaserPreferred: addLaserPreferred,
-  removedLaserPreferred: removedLaserPreferred
-});
+const hide = (ingredient) => `NEI.hide(${ingredient});`;
+const addNEI = (ingredient) => `NEI.addEntry(${ingredient});`;
 
 const addCrucible = (recipe) => {
   const out = formatArgs(recipe.rf, recipe.in, recipe.liquid);
@@ -303,26 +267,6 @@ const addTransposerExtract = (recipe) => {
 };
 const removeTransposerExtract = (ingredient) => `mods.thermalexpansion.Transposer.removeExtractRecipe(${ingredient});`;
 
-var thermalExpansion = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addCrucible: addCrucible,
-  removeCrucible: removeCrucible,
-  addFurnace: addFurnace$1,
-  removeFurnace: removeFurnace$1,
-  addInsolator: addInsolator,
-  removeInsolator: removeInsolator,
-  addPulverizer: addPulverizer,
-  removePulverizer: removePulverizer,
-  addSawmill: addSawmill,
-  removeSawmill: removeSawmill,
-  addSmelter: addSmelter,
-  removeSmelter: removeSmelter,
-  addTransposerFill: addTransposerFill,
-  removeTransposerFill: removeTransposerFill,
-  addTransposerExtract: addTransposerExtract,
-  removeTransposerExtract: removeTransposerExtract
-});
-
 const add = (item, recipe) => {
   const type = Array.isArray(recipe) ? "Shapeless" : "Shaped";
   return `recipes.add${type}(${formatArgs(item, recipe)});`;
@@ -340,22 +284,53 @@ const replace = (item, recipe) => {
   ].join("\n");
 };
 
-var vanilla = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  add: add,
-  remove: remove,
-  removeShaped: removeShaped,
-  removeShapeless: removeShapeless,
-  addFurnace: addFurnace,
-  removeFurnace: removeFurnace,
-  replace: replace
-});
-
-exports.avaritia = avaritia;
-exports.exNihilo = exNihilo;
-exports.extraUtilites = extraUtilities;
-exports.items = items;
-exports.mineFactoryReloaded = mineFactoryReloaded;
-exports.nei = nei;
-exports.thermalexpansion = thermalExpansion;
-exports.vanilla = vanilla;
+exports.add = add;
+exports.addComposter = addComposter;
+exports.addCompressor = addCompressor;
+exports.addCrucibleNihilo = addCrucible$1;
+exports.addCrucibleSource = addCrucibleSource;
+exports.addCrucibleThermal = addCrucible;
+exports.addExtreme = addExtreme;
+exports.addFurnace = addFurnace;
+exports.addFurnaceThermal = addFurnace$1;
+exports.addHammer = addHammer;
+exports.addInsolator = addInsolator;
+exports.addLaser = addLaser;
+exports.addLaserPreferred = addLaserPreferred;
+exports.addNEI = addNEI;
+exports.addPulverizer = addPulverizer;
+exports.addQED = addQED;
+exports.addSawmill = addSawmill;
+exports.addSieve = addSieve;
+exports.addSmelter = addSmelter;
+exports.addTransposerExtract = addTransposerExtract;
+exports.addTransposerFill = addTransposerFill;
+exports.hide = hide;
+exports.remove = remove;
+exports.removeComposter = removeComposter;
+exports.removeCompressor = removeCompressor;
+exports.removeCrucibleNihilo = removeCrucible$1;
+exports.removeCrucibleSource = removeCrucibleSource;
+exports.removeCrucibleThermal = removeCrucible;
+exports.removeExtreme = removeExtreme;
+exports.removeFurnace = removeFurnace;
+exports.removeFurnaceThermal = removeFurnace$1;
+exports.removeHammer = removeHammer;
+exports.removeInsolator = removeInsolator;
+exports.removeLaser = removeLaser;
+exports.removeLaserPreferred = removeLaserPreferred;
+exports.removePulverizer = removePulverizer;
+exports.removeQED = removeQED;
+exports.removeSawmill = removeSawmill;
+exports.removeShaped = removeShaped;
+exports.removeShapeless = removeShapeless;
+exports.removeSieve = removeSieve;
+exports.removeSmelter = removeSmelter;
+exports.removeTransposerExtract = removeTransposerExtract;
+exports.removeTransposerFill = removeTransposerFill;
+exports.replace = replace;
+exports.withEnchantments = withEnchantments;
+exports.withName = withName;
+exports.withTag = withTag;
+exports.withTooltip = withTooltip;
+exports.withTooltipShift = withTooltipShift;

package/dist/zenflow.d.ts

@@ -41,6 +41,18 @@ declare const MFR_LASER_LENSES: {
 
 declare type Ingredients = [ingredient: string, n: number];
 declare type Item = string | Ingredients;
+declare type RecipePatternEdge = {
+    corner: string;
+    edge: string;
+    center: string;
+};
+declare type RecipePatternRing = {
+    ring: string;
+    center: string;
+};
+declare type RecipePatternSquare = {
+    square: string;
+};
 declare type RecipeShaped = Partial<{
     1: string;
     2: string;
@@ -51,10 +63,7 @@ declare type RecipeShaped = Partial<{
     7: string;
     8: string;
     9: string;
-    corner: string;
-    edge: string;
-    center: string;
-}>;
+} | RecipePatternEdge | RecipePatternRing | RecipePatternSquare>;
 declare type RecipeShapeless = string[];
 declare type Recipe = RecipeShaped | RecipeShapeless;
 declare type Enchantment = [keyof typeof ENCHANTMENTS, number];
@@ -85,23 +94,6 @@ declare const removeCompressor: (ingredient: string) => string;
 declare const addExtreme: (item: Item, recipe: RecipeExtreme) => string;
 declare const removeExtreme: (ingredient: string) => string;
 
-type avaritia_RecipeCompressor = RecipeCompressor;
-type avaritia_RecipeExtreme = RecipeExtreme;
-declare const avaritia_addCompressor: typeof addCompressor;
-declare const avaritia_removeCompressor: typeof removeCompressor;
-declare const avaritia_addExtreme: typeof addExtreme;
-declare const avaritia_removeExtreme: typeof removeExtreme;
-declare namespace avaritia {
-  export {
-    avaritia_RecipeCompressor as RecipeCompressor,
-    avaritia_RecipeExtreme as RecipeExtreme,
-    avaritia_addCompressor as addCompressor,
-    avaritia_removeCompressor as removeCompressor,
-    avaritia_addExtreme as addExtreme,
-    avaritia_removeExtreme as removeExtreme,
-  };
-}
-
 declare type RecipeComposter = [
     ingredient: string,
     fill: number,
@@ -140,99 +132,22 @@ declare const removeHammer: (ingredient: string) => string;
 declare const addSieve: (ingredient: string, recipe: RecipeSieve) => string;
 declare const removeSieve: (ingredient: string) => string;
 
-type exNihilo_RecipeComposter = RecipeComposter;
-type exNihilo_RecipeCrucibleHeat = RecipeCrucibleHeat;
-type exNihilo_RecipeHammer = RecipeHammer;
-type exNihilo_RecipeSieve = RecipeSieve;
-declare const exNihilo_addComposter: typeof addComposter;
-declare const exNihilo_removeComposter: typeof removeComposter;
-declare const exNihilo_addCrucibleSource: typeof addCrucibleSource;
-declare const exNihilo_removeCrucibleSource: typeof removeCrucibleSource;
-declare const exNihilo_addHammer: typeof addHammer;
-declare const exNihilo_removeHammer: typeof removeHammer;
-declare const exNihilo_addSieve: typeof addSieve;
-declare const exNihilo_removeSieve: typeof removeSieve;
-declare namespace exNihilo {
-  export {
-    exNihilo_RecipeComposter as RecipeComposter,
-    RecipeCrucible$1 as RecipeCrucible,
-    exNihilo_RecipeCrucibleHeat as RecipeCrucibleHeat,
-    exNihilo_RecipeHammer as RecipeHammer,
-    exNihilo_RecipeSieve as RecipeSieve,
-    exNihilo_addComposter as addComposter,
-    exNihilo_removeComposter as removeComposter,
-    addCrucible$1 as addCrucible,
-    removeCrucible$1 as removeCrucible,
-    exNihilo_addCrucibleSource as addCrucibleSource,
-    exNihilo_removeCrucibleSource as removeCrucibleSource,
-    exNihilo_addHammer as addHammer,
-    exNihilo_removeHammer as removeHammer,
-    exNihilo_addSieve as addSieve,
-    exNihilo_removeSieve as removeSieve,
-  };
-}
-
 declare const addQED: (item: Item, recipe: RecipeShaped) => string;
 declare const removeQED: (ingredient: string) => string;
 
-declare const extraUtilities_addQED: typeof addQED;
-declare const extraUtilities_removeQED: typeof removeQED;
-declare namespace extraUtilities {
-  export {
-    extraUtilities_addQED as addQED,
-    extraUtilities_removeQED as removeQED,
-  };
-}
-
 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: (enchantments: Enchantment[]) => (ingredient: string) => string;
 
-declare const items_withName: typeof withName;
-declare const items_withTooltip: typeof withTooltip;
-declare const items_withTooltipShift: typeof withTooltipShift;
-declare const items_withTag: typeof withTag;
-declare const items_withEnchantments: typeof withEnchantments;
-declare namespace items {
-  export {
-    items_withName as withName,
-    items_withTooltip as withTooltip,
-    items_withTooltipShift as withTooltipShift,
-    items_withTag as withTag,
-    items_withEnchantments as withEnchantments,
-  };
-}
-
-declare const hide: (ingredient: string) => string;
-declare const add$1: (ingredient: string) => string;
-
-declare const nei_hide: typeof hide;
-declare namespace nei {
-  export {
-    nei_hide as hide,
-    add$1 as add,
-  };
-}
-
 declare const addLaser: (item: Item) => string;
 declare const removeLaser: (ingredient: string) => string;
 declare const addLaserPreferred: (lens: keyof typeof MFR_LASER_LENSES, ingredients: string[]) => string;
-declare const removedLaserPreferred: (lens: keyof typeof MFR_LASER_LENSES, ingredient: string) => string;
+declare const removeLaserPreferred: (lens: keyof typeof MFR_LASER_LENSES, ingredient: string) => string;
 
-declare const mineFactoryReloaded_addLaser: typeof addLaser;
-declare const mineFactoryReloaded_removeLaser: typeof removeLaser;
-declare const mineFactoryReloaded_addLaserPreferred: typeof addLaserPreferred;
-declare const mineFactoryReloaded_removedLaserPreferred: typeof removedLaserPreferred;
-declare namespace mineFactoryReloaded {
-  export {
-    mineFactoryReloaded_addLaser as addLaser,
-    mineFactoryReloaded_removeLaser as removeLaser,
-    mineFactoryReloaded_addLaserPreferred as addLaserPreferred,
-    mineFactoryReloaded_removedLaserPreferred as removedLaserPreferred,
-  };
-}
+declare const hide: (ingredient: string) => string;
+declare const addNEI: (ingredient: string) => string;
 
 declare type RecipeCrucible = {
     rf: number;
@@ -346,56 +261,6 @@ declare const removeTransposerFill: (ingredient: string, liquid: string) => stri
 declare const addTransposerExtract: (recipe: RecipeTransposerExtract) => string;
 declare const removeTransposerExtract: (ingredient: string) => string;
 
-type thermalExpansion_RecipeCrucible = RecipeCrucible;
-type thermalExpansion_RecipeInsolator = RecipeInsolator;
-type thermalExpansion_RecipePulverizer = RecipePulverizer;
-type thermalExpansion_RecipeSawmill = RecipeSawmill;
-type thermalExpansion_RecipeSmelter = RecipeSmelter;
-type thermalExpansion_RecipeTransposerFill = RecipeTransposerFill;
-type thermalExpansion_RecipeTransposerExtract = RecipeTransposerExtract;
-declare const thermalExpansion_addCrucible: typeof addCrucible;
-declare const thermalExpansion_removeCrucible: typeof removeCrucible;
-declare const thermalExpansion_addInsolator: typeof addInsolator;
-declare const thermalExpansion_removeInsolator: typeof removeInsolator;
-declare const thermalExpansion_addPulverizer: typeof addPulverizer;
-declare const thermalExpansion_removePulverizer: typeof removePulverizer;
-declare const thermalExpansion_addSawmill: typeof addSawmill;
-declare const thermalExpansion_removeSawmill: typeof removeSawmill;
-declare const thermalExpansion_addSmelter: typeof addSmelter;
-declare const thermalExpansion_removeSmelter: typeof removeSmelter;
-declare const thermalExpansion_addTransposerFill: typeof addTransposerFill;
-declare const thermalExpansion_removeTransposerFill: typeof removeTransposerFill;
-declare const thermalExpansion_addTransposerExtract: typeof addTransposerExtract;
-declare const thermalExpansion_removeTransposerExtract: typeof removeTransposerExtract;
-declare namespace thermalExpansion {
-  export {
-    thermalExpansion_RecipeCrucible as RecipeCrucible,
-    RecipeFurnace$1 as RecipeFurnace,
-    thermalExpansion_RecipeInsolator as RecipeInsolator,
-    thermalExpansion_RecipePulverizer as RecipePulverizer,
-    thermalExpansion_RecipeSawmill as RecipeSawmill,
-    thermalExpansion_RecipeSmelter as RecipeSmelter,
-    thermalExpansion_RecipeTransposerFill as RecipeTransposerFill,
-    thermalExpansion_RecipeTransposerExtract as RecipeTransposerExtract,
-    thermalExpansion_addCrucible as addCrucible,
-    thermalExpansion_removeCrucible as removeCrucible,
-    addFurnace$1 as addFurnace,
-    removeFurnace$1 as removeFurnace,
-    thermalExpansion_addInsolator as addInsolator,
-    thermalExpansion_removeInsolator as removeInsolator,
-    thermalExpansion_addPulverizer as addPulverizer,
-    thermalExpansion_removePulverizer as removePulverizer,
-    thermalExpansion_addSawmill as addSawmill,
-    thermalExpansion_removeSawmill as removeSawmill,
-    thermalExpansion_addSmelter as addSmelter,
-    thermalExpansion_removeSmelter as removeSmelter,
-    thermalExpansion_addTransposerFill as addTransposerFill,
-    thermalExpansion_removeTransposerFill as removeTransposerFill,
-    thermalExpansion_addTransposerExtract as addTransposerExtract,
-    thermalExpansion_removeTransposerExtract as removeTransposerExtract,
-  };
-}
-
 declare type RecipeFurnace = {
     in: string;
     out: Item;
@@ -408,23 +273,4 @@ declare const addFurnace: (recipe: RecipeFurnace) => string;
 declare const removeFurnace: (ingredient: string) => string;
 declare const replace: (item: Item, recipe: Recipe) => string;
 
-declare const vanilla_add: typeof add;
-declare const vanilla_remove: typeof remove;
-declare const vanilla_removeShaped: typeof removeShaped;
-declare const vanilla_removeShapeless: typeof removeShapeless;
-declare const vanilla_addFurnace: typeof addFurnace;
-declare const vanilla_removeFurnace: typeof removeFurnace;
-declare const vanilla_replace: typeof replace;
-declare namespace vanilla {
-  export {
-    vanilla_add as add,
-    vanilla_remove as remove,
-    vanilla_removeShaped as removeShaped,
-    vanilla_removeShapeless as removeShapeless,
-    vanilla_addFurnace as addFurnace,
-    vanilla_removeFurnace as removeFurnace,
-    vanilla_replace as replace,
-  };
-}
-
-export { avaritia, exNihilo, extraUtilities as extraUtilites, items, mineFactoryReloaded, nei, thermalExpansion as thermalexpansion, vanilla };
+export { add, addComposter, addCompressor, addCrucible$1 as addCrucibleNihilo, addCrucibleSource, addCrucible as addCrucibleThermal, addExtreme, addFurnace, addFurnace$1 as addFurnaceThermal, addHammer, addInsolator, addLaser, addLaserPreferred, addNEI, addPulverizer, addQED, addSawmill, addSieve, addSmelter, addTransposerExtract, addTransposerFill, hide, remove, removeComposter, removeCompressor, removeCrucible$1 as removeCrucibleNihilo, removeCrucibleSource, removeCrucible as removeCrucibleThermal, removeExtreme, removeFurnace, removeFurnace$1 as removeFurnaceThermal, removeHammer, removeInsolator, removeLaser, removeLaserPreferred, removePulverizer, removeQED, removeSawmill, removeShaped, removeShapeless, removeSieve, removeSmelter, removeTransposerExtract, removeTransposerFill, replace, withEnchantments, withName, withTag, withTooltip, withTooltipShift };

package/dist/zenflow.mjs

@@ -121,11 +121,26 @@ const formatTooltip = (texts) => {
   return texts.map(formatTooltip).join(" + ");
 };
 const formatRecipeShaped = (recipe) => {
-  const matrix = [
-    [recipe.corner || recipe[1], recipe.edge || recipe[2], recipe.corner || recipe[3]],
-    [recipe.edge || recipe[4], recipe.center || recipe[5], recipe.edge || recipe[6]],
-    [recipe.corner || recipe[7], recipe.edge || recipe[8], recipe.corner || recipe[9]]
-  ].map((row) => formatList(row.map(formatIngredient)));
+  const getSlot = (slot, patterns) => {
+    for (let i = 0; i < patterns.length; i += 1) {
+      if (patterns[i] in recipe)
+        return recipe[patterns[i]];
+    }
+    return recipe[slot];
+  };
+  const matrix = [[
+    getSlot(1, ["corner", "ring", "square"]),
+    getSlot(2, ["edge", "ring", "square"]),
+    getSlot(3, ["corner", "ring"])
+  ], [
+    getSlot(4, ["edge", "ring", "square"]),
+    getSlot(5, ["center", "square"]),
+    getSlot(6, ["edge", "ring"])
+  ], [
+    getSlot(7, ["corner", "ring"]),
+    getSlot(8, ["edge", "ring"]),
+    getSlot(9, ["corner", "ring"])
+  ]].map((row) => formatList(row.map(formatIngredient)));
   return `[
 	${matrix.join(",\n	")}
 ]`;
@@ -155,14 +170,6 @@ const addExtreme = (item, recipe) => {
 };
 const removeExtreme = (ingredient) => `mods.avaritia.ExtremeCrafting.remove(${ingredient});`;
 
-var avaritia = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addCompressor: addCompressor,
-  removeCompressor: removeCompressor,
-  addExtreme: addExtreme,
-  removeExtreme: removeExtreme
-});
-
 const clamp = (min, max, n) => Math.max(min, Math.min(max, n));
 const fill = (n, x) => Array.from({ length: n }).map((_, i) => x ?? i);
 
@@ -198,65 +205,22 @@ const addSieve = (ingredient, recipe) => {
 };
 const removeSieve = (ingredient) => `mods.exnihilo.Sieve.removeRecipe(${ingredient});`;
 
-var exNihilo = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addComposter: addComposter,
-  removeComposter: removeComposter,
-  addCrucible: addCrucible$1,
-  removeCrucible: removeCrucible$1,
-  addCrucibleSource: addCrucibleSource,
-  removeCrucibleSource: removeCrucibleSource,
-  addHammer: addHammer,
-  removeHammer: removeHammer,
-  addSieve: addSieve,
-  removeSieve: removeSieve
-});
-
 const addQED = (item, recipe) => `mods.extraUtils.QED.addShapedRecipe(${formatArgs(item, recipe)});`;
 const removeQED = (ingredient) => `mods.extraUtils.QED.removeRecipe(${ingredient});`;
 
-var extraUtilities = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addQED: addQED,
-  removeQED: removeQED
-});
-
 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 = (enchantments) => withTag(`{ ench: ${formatList(enchantments.map(formatEnchantment))} }`);
 
-var items = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  withName: withName,
-  withTooltip: withTooltip,
-  withTooltipShift: withTooltipShift,
-  withTag: withTag,
-  withEnchantments: withEnchantments
-});
-
-const hide = (ingredient) => `NEI.hide(${ingredient});`;
-const add$1 = (ingredient) => `NEI.addEntry(${ingredient});`;
-
-var nei = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  hide: hide,
-  add: add$1
-});
-
 const addLaser = (item) => `MiningLaser.addOre(${formatArgs(item)});`;
 const removeLaser = (ingredient) => `MiningLaser.removeOre(${ingredient});`;
 const addLaserPreferred = (lens, ingredients) => ingredients.map((ingredient) => `MiningLaser.addPreferredOre(${formatArgs(MFR_LASER_LENSES[lens], ingredient)});`).join("\n");
-const removedLaserPreferred = (lens, ingredient) => `MiningLaser.removePreferredOre(${formatArgs(MFR_LASER_LENSES[lens], ingredient)});`;
+const removeLaserPreferred = (lens, ingredient) => `MiningLaser.removePreferredOre(${formatArgs(MFR_LASER_LENSES[lens], ingredient)});`;
 
-var mineFactoryReloaded = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addLaser: addLaser,
-  removeLaser: removeLaser,
-  addLaserPreferred: addLaserPreferred,
-  removedLaserPreferred: removedLaserPreferred
-});
+const hide = (ingredient) => `NEI.hide(${ingredient});`;
+const addNEI = (ingredient) => `NEI.addEntry(${ingredient});`;
 
 const addCrucible = (recipe) => {
   const out = formatArgs(recipe.rf, recipe.in, recipe.liquid);
@@ -299,26 +263,6 @@ const addTransposerExtract = (recipe) => {
 };
 const removeTransposerExtract = (ingredient) => `mods.thermalexpansion.Transposer.removeExtractRecipe(${ingredient});`;
 
-var thermalExpansion = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  addCrucible: addCrucible,
-  removeCrucible: removeCrucible,
-  addFurnace: addFurnace$1,
-  removeFurnace: removeFurnace$1,
-  addInsolator: addInsolator,
-  removeInsolator: removeInsolator,
-  addPulverizer: addPulverizer,
-  removePulverizer: removePulverizer,
-  addSawmill: addSawmill,
-  removeSawmill: removeSawmill,
-  addSmelter: addSmelter,
-  removeSmelter: removeSmelter,
-  addTransposerFill: addTransposerFill,
-  removeTransposerFill: removeTransposerFill,
-  addTransposerExtract: addTransposerExtract,
-  removeTransposerExtract: removeTransposerExtract
-});
-
 const add = (item, recipe) => {
   const type = Array.isArray(recipe) ? "Shapeless" : "Shaped";
   return `recipes.add${type}(${formatArgs(item, recipe)});`;
@@ -336,15 +280,4 @@ const replace = (item, recipe) => {
   ].join("\n");
 };
 
-var vanilla = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  add: add,
-  remove: remove,
-  removeShaped: removeShaped,
-  removeShapeless: removeShapeless,
-  addFurnace: addFurnace,
-  removeFurnace: removeFurnace,
-  replace: replace
-});
-
-export { avaritia, exNihilo, extraUtilities as extraUtilites, items, mineFactoryReloaded, nei, thermalExpansion as thermalexpansion, vanilla };
+export { add, addComposter, addCompressor, addCrucible$1 as addCrucibleNihilo, addCrucibleSource, addCrucible as addCrucibleThermal, addExtreme, addFurnace, addFurnace$1 as addFurnaceThermal, addHammer, addInsolator, addLaser, addLaserPreferred, addNEI, addPulverizer, addQED, addSawmill, addSieve, addSmelter, addTransposerExtract, addTransposerFill, hide, remove, removeComposter, removeCompressor, removeCrucible$1 as removeCrucibleNihilo, removeCrucibleSource, removeCrucible as removeCrucibleThermal, removeExtreme, removeFurnace, removeFurnace$1 as removeFurnaceThermal, removeHammer, removeInsolator, removeLaser, removeLaserPreferred, removePulverizer, removeQED, removeSawmill, removeShaped, removeShapeless, removeSieve, removeSmelter, removeTransposerExtract, removeTransposerFill, replace, withEnchantments, withName, withTag, withTooltip, withTooltipShift };

package/package.json

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