zen-flow 2.8.2 → 2.9.0

package/dist/zenflow.cjs

@@ -98,11 +98,10 @@ const MFR_FOCI = {
   black: 15
 };
 
-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 capitalize = (x) => `${x[0].toUpperCase()}${x.slice(1)}`;
+
+const toArray = (x) => Array.isArray(x) ? x : [x];
+const fill = (n, x) => Array.from({ length: n }).map((_, i) => x ?? i);
 
 const formatLiteral = (x) => `"${x}"`;
 const formatId = (id) => id ?? "null";
@@ -164,6 +163,8 @@ const formatArgs = (...args) => {
 ` : list.join(", ");
 };
 
+const capitalize = (x) => `${x[0].toUpperCase()}${x.slice(1)}`;
+
 const addGrinder = (recipe) => {
   const formatBonus = (stack) => `${stack.id}, ${stack.n}`;
   const out = formatArgs(formatIngredient(recipe.in), formatIngredient(recipe.out), recipe.turns, recipe.bonus && formatBonus(recipe.bonus.primary), recipe.bonus?.secondary && formatBonus(recipe.bonus.secondary));
@@ -188,6 +189,8 @@ const addExtreme = (ingredient, recipe) => {
 };
 const removeExtreme = (id) => `mods.avaritia.ExtremeCrafting.remove(${id});`;
 
+const clamp = (min, max, n) => Math.max(min, Math.min(max, n));
+
 const addComposter = (recipe) => {
   const out = formatArgs(recipe.id, clamp(0, 1, recipe.fill), recipe.hex && `"${recipe.hex}"`);
   return `mods.exnihilo.Composting.addRecipe(${out});`;
@@ -255,23 +258,15 @@ const addFermenterFuel = (recipe) => {
 const removeFermenterFuel = (id) => `mods.forestry.Fermenter.removeFuel(${id});`;
 const removeMoistener = (id) => `mods.forestry.Moistener.removeRecipe(${id});`;
 const addSqueezer = (recipe) => {
-  const out = formatArgs(formatStack(recipe.out), formatIngredient(recipe.bonus), recipe.in.map(formatIngredient), recipe.ticks);
+  const out = formatArgs(formatStack(recipe.out), formatStack(recipe.bonus), toArray(recipe.in).map(formatIngredient), recipe.ticks);
   return `mods.forestry.Squeezer.addRecipe(${out});`;
 };
-const removeSqueezer = (recipe) => {
-  if (typeof recipe === "string")
-    return `mods.forestry.Squeezer.removeRecipe(${recipe});`;
-  return `mods.forestry.Squeezer.removeRecipe(${formatArgs(recipe.out, recipe.in)});`;
-};
+const removeSqueezer = (id, liquid) => `mods.forestry.Squeezer.removeRecipe(${formatArgs(liquid, toArray(id))});`;
 const addStill = (recipe) => {
   const out = formatArgs(formatStack(recipe.out), formatStack(recipe.in), recipe.ticks);
   return `mods.forestry.Still.addRecipe(${out});`;
 };
-const removeStill = (recipe) => {
-  if (typeof recipe === "string")
-    return `mods.forestry.Still.removeRecipe(${recipe});`;
-  return `mods.forestry.Still.removeRecipe(${formatArgs(recipe.out, recipe.in)});`;
-};
+const removeStill = (id, liquid) => `mods.forestry.Still.removeRecipe(${formatArgs(id, liquid)});`;
 const addFabricator = (recipe) => {
   const out = formatArgs(formatIngredient(recipe.out), formatRecipe(recipe.recipe), recipe.mb, recipe.cast);
   return `mods.forestry.ThermionicFabricator.addCast(${out});`;

package/dist/zenflow.d.ts

@@ -202,9 +202,9 @@ declare type RecipeFermenterFuel = {
 };
 declare type RecipeSqueezer = {
     out: Stack;
-    in: Ingredient[];
-    bonus: Ingredient;
+    in: Ingredient | Ingredient[];
     ticks: number;
+    bonus: Stack;
 };
 declare type RecipeStill = {
     in: Stack;
@@ -231,6 +231,9 @@ declare const removeFermenter: (id: string) => string;
 declare const addFermenterFuel: (recipe: RecipeFermenterFuel) => string;
 declare const removeFermenterFuel: (id: string) => string;
 declare const removeMoistener: (id: string) => string;
+/**
+ * @param recipe.bonus - ModTweaker does not support optional `bonus`
+ */
 declare const addSqueezer: (recipe: RecipeSqueezer) => string;
 /**
  * Remove Forestry Squeezer recipe
@@ -238,10 +241,7 @@ declare const addSqueezer: (recipe: RecipeSqueezer) => string;
  * - Recipe: `string` => Remove all recipes
  * - Recipe: `object` => Remove specific recipe
  */
-declare const removeSqueezer: (recipe: string | {
-    in: string[];
-    out: string;
-}) => string;
+declare const removeSqueezer: (id: string | string[], liquid: string) => string;
 declare const addStill: (recipe: RecipeStill) => string;
 /**
  * Remove Forestry Still recipe
@@ -249,10 +249,7 @@ declare const addStill: (recipe: RecipeStill) => string;
  * - Recipe: `string` => Remove all recipes
  * - Recipe: `object` => Remove specific recipe
  */
-declare const removeStill: (recipe: string | {
-    in: string;
-    out: string;
-}) => string;
+declare const removeStill: (id: string, liquid?: string | undefined) => string;
 declare const addFabricator: (recipe: RecipeFabricator) => string;
 declare const removeFabricator: (id: string) => string;
 declare const addFabricatorFuel: (recipe: RecipeFabricatorFuel) => string;
@@ -383,6 +380,11 @@ declare const removeInsolator: (left: Ingredient, right: Ingredient) => string;
  */
 declare const addPulverizer: (recipe: RecipePulverizer) => string;
 declare const removePulverizer: (id: string) => string;
+/**
+ * Common values:
+ *  - Log: `800RF`
+ *  - Tools: `1600RF`
+ */
 declare const addSawmill: (recipe: RecipeSawmill) => string;
 declare const removeSawmill: (id: string) => string;
 /**
@@ -428,7 +430,7 @@ declare type RecipeFurnace = {
  */
 declare const add: (item: Ingredient, recipe: Recipe) => string;
 /**
- * Add shaped crafint recipe with mirror
+ * Add shaped crafing recipe with mirror
  */
 declare const addMirror: (item: Ingredient, recipe: RecipeShaped) => string;
 /**
@@ -448,12 +450,6 @@ declare const removeShaped: (id: string, recipe?: Partial<{
     7: string;
     8: string;
     9: string;
-    /**
-     * Add crafting recipe
-     *
-     * - Recipe: `{}` => Shaped recipe
-     * - Recipe: `[]` => Shapeless recipe
-     */
     corner: string;
     edge: string;
     ring: string;

package/dist/zenflow.mjs

@@ -94,11 +94,10 @@ const MFR_FOCI = {
   black: 15
 };
 
-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 capitalize = (x) => `${x[0].toUpperCase()}${x.slice(1)}`;
+
+const toArray = (x) => Array.isArray(x) ? x : [x];
+const fill = (n, x) => Array.from({ length: n }).map((_, i) => x ?? i);
 
 const formatLiteral = (x) => `"${x}"`;
 const formatId = (id) => id ?? "null";
@@ -160,6 +159,8 @@ const formatArgs = (...args) => {
 ` : list.join(", ");
 };
 
+const capitalize = (x) => `${x[0].toUpperCase()}${x.slice(1)}`;
+
 const addGrinder = (recipe) => {
   const formatBonus = (stack) => `${stack.id}, ${stack.n}`;
   const out = formatArgs(formatIngredient(recipe.in), formatIngredient(recipe.out), recipe.turns, recipe.bonus && formatBonus(recipe.bonus.primary), recipe.bonus?.secondary && formatBonus(recipe.bonus.secondary));
@@ -184,6 +185,8 @@ const addExtreme = (ingredient, recipe) => {
 };
 const removeExtreme = (id) => `mods.avaritia.ExtremeCrafting.remove(${id});`;
 
+const clamp = (min, max, n) => Math.max(min, Math.min(max, n));
+
 const addComposter = (recipe) => {
   const out = formatArgs(recipe.id, clamp(0, 1, recipe.fill), recipe.hex && `"${recipe.hex}"`);
   return `mods.exnihilo.Composting.addRecipe(${out});`;
@@ -251,23 +254,15 @@ const addFermenterFuel = (recipe) => {
 const removeFermenterFuel = (id) => `mods.forestry.Fermenter.removeFuel(${id});`;
 const removeMoistener = (id) => `mods.forestry.Moistener.removeRecipe(${id});`;
 const addSqueezer = (recipe) => {
-  const out = formatArgs(formatStack(recipe.out), formatIngredient(recipe.bonus), recipe.in.map(formatIngredient), recipe.ticks);
+  const out = formatArgs(formatStack(recipe.out), formatStack(recipe.bonus), toArray(recipe.in).map(formatIngredient), recipe.ticks);
   return `mods.forestry.Squeezer.addRecipe(${out});`;
 };
-const removeSqueezer = (recipe) => {
-  if (typeof recipe === "string")
-    return `mods.forestry.Squeezer.removeRecipe(${recipe});`;
-  return `mods.forestry.Squeezer.removeRecipe(${formatArgs(recipe.out, recipe.in)});`;
-};
+const removeSqueezer = (id, liquid) => `mods.forestry.Squeezer.removeRecipe(${formatArgs(liquid, toArray(id))});`;
 const addStill = (recipe) => {
   const out = formatArgs(formatStack(recipe.out), formatStack(recipe.in), recipe.ticks);
   return `mods.forestry.Still.addRecipe(${out});`;
 };
-const removeStill = (recipe) => {
-  if (typeof recipe === "string")
-    return `mods.forestry.Still.removeRecipe(${recipe});`;
-  return `mods.forestry.Still.removeRecipe(${formatArgs(recipe.out, recipe.in)});`;
-};
+const removeStill = (id, liquid) => `mods.forestry.Still.removeRecipe(${formatArgs(id, liquid)});`;
 const addFabricator = (recipe) => {
   const out = formatArgs(formatIngredient(recipe.out), formatRecipe(recipe.recipe), recipe.mb, recipe.cast);
   return `mods.forestry.ThermionicFabricator.addCast(${out});`;

package/package.json

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