zen-flow 1.4.1 → 1.6.0

package/README.md

@@ -166,6 +166,7 @@ Shaped crafting recipes support the following shorthand patterns, in order:
  - `withTooltipShift` - Add shift item tooltip*
  - `withTag` - Add item NBT tag data
    - [Display properties](https://minecraft.fandom.com/wiki/Player.dat_format#Display_Properties)
+ - `withEnchantment` - Add item enchantment
  - `withEnchantments` - Add item enchantments
 
 <i>* It is currently not possible to remove item tooltips.</i>

package/dist/zenflow.cjs

@@ -209,6 +209,7 @@ const withName = (ingredient, name) => `${ingredient}.displayName = ${formatName
 const withTooltip = (ingredient, tooltip) => `${ingredient}.addTooltip(${formatTooltip(tooltip)});`;
 const withTooltipShift = (ingredient, tooltip) => `${ingredient}.addShiftTooltip(${formatTooltip(tooltip)});`;
 const withTag = (tag) => (ingredient) => `${ingredient}.withTag(${tag});`;
+const withEnchantment = (enchantment) => withTag(`{ ench: ${formatList([formatEnchantment(enchantment)])} }`);
 const withEnchantments = (enchantments) => withTag(`{ ench: ${formatList(enchantments.map(formatEnchantment))} }`);
 
 const addLaser = (item) => `MiningLaser.addOre(${formatArgs(item)});`;
@@ -230,22 +231,22 @@ const addFurnace$1 = (recipe) => {
 };
 const removeFurnace$1 = (ingredient) => `mods.thermalexpansion.Furnace.removeRecipe(${ingredient});`;
 const addInsolator = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.left, recipe.right, recipe.out, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.left, recipe.right, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Insolator.addRecipe(${out});`;
 };
 const removeInsolator = (left, right) => `mods.thermalexpansion.Insolator.removeRecipe(${formatArgs(left, right)});`;
 const addPulverizer = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Pulverizer.addRecipe(${out});`;
 };
 const removePulverizer = (ingredient) => `mods.thermalexpansion.Pulverizer.removeRecipe(${ingredient});`;
 const addSawmill = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Sawmill.addRecipe(${out});`;
 };
 const removeSawmill = (ingredient) => `mods.thermalexpansion.Sawmill.removeRecipe(${ingredient});`;
 const addSmelter = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.right, recipe.left, recipe.out, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.right, recipe.left, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Smelter.addRecipe(${out});`;
 };
 const removeSmelter = (left, right) => `mods.thermalexpansion.Smelter.removeRecipe(${formatArgs(left, right)});`;
@@ -255,7 +256,7 @@ const addTransposerFill = (recipe) => {
 };
 const removeTransposerFill = (ingredient, liquid) => `mods.thermalexpansion.Transposer.removeFillRecipe(${formatArgs(ingredient, liquid)});`;
 const addTransposerExtract = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.liquid, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.in, recipe.liquid, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Transposer.addExtractRecipe(${out});`;
 };
 const removeTransposerExtract = (ingredient) => `mods.thermalexpansion.Transposer.removeExtractRecipe(${ingredient});`;
@@ -265,8 +266,8 @@ const add = (item, recipe) => {
   return `recipes.add${type}(${formatArgs(item, recipe)});`;
 };
 const remove = (ingredient) => `recipes.remove(${ingredient});`;
-const removeShaped = (ingredient) => `recipes.removeShaped(${ingredient});`;
-const removeShapeless = (ingredient) => `recipes.removeShapeless(${ingredient});`;
+const removeShaped = (ingredient, recipe) => `recipes.removeShaped(${formatArgs(ingredient, recipe)});`;
+const removeShapeless = (ingredient, recipe) => `recipes.removeShapeless(${formatArgs(ingredient, recipe)});`;
 const addFurnace = (recipe) => `furnace.addRecipe(${formatArgs(recipe.out, recipe.in)});`;
 const removeFurnace = (ingredient) => `furnace.remove(${ingredient});`;
 const replace = (item, recipe) => {
@@ -327,6 +328,7 @@ exports.removeTransposerExtract = removeTransposerExtract;
 exports.removeTransposerFill = removeTransposerFill;
 exports.replace = replace;
 exports.replaceAll = replaceAll;
+exports.withEnchantment = withEnchantment;
 exports.withEnchantments = withEnchantments;
 exports.withName = withName;
 exports.withTag = withTag;

package/dist/zenflow.d.ts

@@ -41,6 +41,7 @@ declare const MFR_LASER_LENSES: {
 
 declare type Ingredients = [ingredient: string, n: number];
 declare type Item = string | Ingredients;
+declare type Bonus = [item: Item, chance: number];
 declare type RecipeShaped = Partial<{
     1: string;
     2: string;
@@ -132,6 +133,7 @@ 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 withEnchantment: (enchantment: Enchantment) => (ingredient: string) => string;
 declare const withEnchantments: (enchantments: Enchantment[]) => (ingredient: string) => string;
 
 declare const addLaser: (item: Item) => string;
@@ -150,33 +152,33 @@ declare type RecipeCrucible = {
 declare type RecipeFurnace$1 = {
     rf: number;
     in: string;
-    out: Ingredients;
+    out: Item;
 };
 declare type RecipeInsolator = {
     rf: number;
-    left: Ingredients;
-    right: Ingredients;
-    out: Ingredients;
-    bonus?: Ingredients;
+    left: Item;
+    right: Item;
+    out: Item;
+    bonus?: Bonus;
 };
 declare type RecipePulverizer = {
     rf: number;
     in: string;
-    out: Ingredients;
-    bonus?: Ingredients;
+    out: Item;
+    bonus?: Bonus;
 };
 declare type RecipeSawmill = {
     rf: number;
     in: string;
-    out: Ingredients;
-    bonus?: Ingredients;
+    out: Item;
+    bonus?: Bonus;
 };
 declare type RecipeSmelter = {
     rf: number;
-    left: Ingredients;
-    right: Ingredients;
-    out: Ingredients;
-    bonus?: Ingredients;
+    left: Item;
+    right: Item;
+    out: Item;
+    bonus?: Bonus;
 };
 declare type RecipeTransposerFill = {
     rf: number;
@@ -188,7 +190,7 @@ declare type RecipeTransposerExtract = {
     rf: number;
     in: string;
     liquid: Ingredients;
-    bonus?: Ingredients;
+    bonus?: Bonus;
 };
 /**
  * Common values:
@@ -260,11 +262,26 @@ declare type RecipeFurnace = {
 };
 declare const add: (item: Item, recipe: Recipe) => string;
 declare const remove: (ingredient: string) => string;
-declare const removeShaped: (ingredient: string) => string;
-declare const removeShapeless: (ingredient: string) => string;
+declare const removeShaped: (ingredient: string, recipe?: 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;
+}> | undefined) => string;
+declare const removeShapeless: (ingredient: string, recipe?: RecipeShapeless | undefined) => string;
 declare const addFurnace: (recipe: RecipeFurnace) => string;
 declare const removeFurnace: (ingredient: string) => string;
 declare const replace: (item: Item, recipe: Recipe) => string;
 declare const replaceAll: (item: Item, recipes: Recipe[]) => string;
 
-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, replaceAll, withEnchantments, withName, withTag, withTooltip, withTooltipShift };
+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, replaceAll, withEnchantment, withEnchantments, withName, withTag, withTooltip, withTooltipShift };

package/dist/zenflow.mjs

@@ -205,6 +205,7 @@ const withName = (ingredient, name) => `${ingredient}.displayName = ${formatName
 const withTooltip = (ingredient, tooltip) => `${ingredient}.addTooltip(${formatTooltip(tooltip)});`;
 const withTooltipShift = (ingredient, tooltip) => `${ingredient}.addShiftTooltip(${formatTooltip(tooltip)});`;
 const withTag = (tag) => (ingredient) => `${ingredient}.withTag(${tag});`;
+const withEnchantment = (enchantment) => withTag(`{ ench: ${formatList([formatEnchantment(enchantment)])} }`);
 const withEnchantments = (enchantments) => withTag(`{ ench: ${formatList(enchantments.map(formatEnchantment))} }`);
 
 const addLaser = (item) => `MiningLaser.addOre(${formatArgs(item)});`;
@@ -226,22 +227,22 @@ const addFurnace$1 = (recipe) => {
 };
 const removeFurnace$1 = (ingredient) => `mods.thermalexpansion.Furnace.removeRecipe(${ingredient});`;
 const addInsolator = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.left, recipe.right, recipe.out, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.left, recipe.right, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Insolator.addRecipe(${out});`;
 };
 const removeInsolator = (left, right) => `mods.thermalexpansion.Insolator.removeRecipe(${formatArgs(left, right)});`;
 const addPulverizer = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Pulverizer.addRecipe(${out});`;
 };
 const removePulverizer = (ingredient) => `mods.thermalexpansion.Pulverizer.removeRecipe(${ingredient});`;
 const addSawmill = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.in, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Sawmill.addRecipe(${out});`;
 };
 const removeSawmill = (ingredient) => `mods.thermalexpansion.Sawmill.removeRecipe(${ingredient});`;
 const addSmelter = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.right, recipe.left, recipe.out, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.right, recipe.left, recipe.out, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Smelter.addRecipe(${out});`;
 };
 const removeSmelter = (left, right) => `mods.thermalexpansion.Smelter.removeRecipe(${formatArgs(left, right)});`;
@@ -251,7 +252,7 @@ const addTransposerFill = (recipe) => {
 };
 const removeTransposerFill = (ingredient, liquid) => `mods.thermalexpansion.Transposer.removeFillRecipe(${formatArgs(ingredient, liquid)});`;
 const addTransposerExtract = (recipe) => {
-  const out = formatArgs(recipe.rf, recipe.in, recipe.liquid, recipe.bonus);
+  const out = formatArgs(recipe.rf, recipe.in, recipe.liquid, recipe.bonus && recipe.bonus[0], recipe.bonus && recipe.bonus[1]);
   return `mods.thermalexpansion.Transposer.addExtractRecipe(${out});`;
 };
 const removeTransposerExtract = (ingredient) => `mods.thermalexpansion.Transposer.removeExtractRecipe(${ingredient});`;
@@ -261,8 +262,8 @@ const add = (item, recipe) => {
   return `recipes.add${type}(${formatArgs(item, recipe)});`;
 };
 const remove = (ingredient) => `recipes.remove(${ingredient});`;
-const removeShaped = (ingredient) => `recipes.removeShaped(${ingredient});`;
-const removeShapeless = (ingredient) => `recipes.removeShapeless(${ingredient});`;
+const removeShaped = (ingredient, recipe) => `recipes.removeShaped(${formatArgs(ingredient, recipe)});`;
+const removeShapeless = (ingredient, recipe) => `recipes.removeShapeless(${formatArgs(ingredient, recipe)});`;
 const addFurnace = (recipe) => `furnace.addRecipe(${formatArgs(recipe.out, recipe.in)});`;
 const removeFurnace = (ingredient) => `furnace.remove(${ingredient});`;
 const replace = (item, recipe) => {
@@ -277,4 +278,4 @@ const replaceAll = (item, recipes) => [
   recipes.map((recipe) => add(item, recipe))
 ].join("\n");
 
-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, replaceAll, withEnchantments, withName, withTag, withTooltip, withTooltipShift };
+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, replaceAll, withEnchantment, withEnchantments, withName, withTag, withTooltip, withTooltipShift };

package/package.json

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