zen-flow 2.7.0 → 2.8.1

package/dist/zenflow.cjs

@@ -176,7 +176,11 @@ const addInscriber = (recipe) => {
 };
 const removeInscriber = (id) => `mods.appeng.Inscriber.removeRecipe(${id});`;
 
-const addCompressor = (recipe) => `mods.avaritia.Compressor.add(${formatArgs(recipe.out, recipe.in.n, recipe.in.id)});`;
+const addCompressor = (recipe) => {
+  const input = isObject(recipe.in) ? recipe.in : { id: recipe.in, n: 1 };
+  const out = formatArgs(recipe.out, input.n, input.id);
+  return `mods.avaritia.Compressor.add(${out});`;
+};
 const removeCompressor = (id) => `mods.avaritia.Compressor.remove(${id});`;
 const addExtreme = (ingredient, recipe) => {
   const out = formatArgs(formatIngredient(ingredient), recipe.map((row) => formatList(row.map(formatId))));
@@ -229,13 +233,13 @@ const replaceQED = (ingredient, recipe) => [
   addQED(ingredient, recipe)
 ].join("\n");
 
-const addCarpenter = (ingredient, recipe) => {
-  const out = formatArgs(formatIngredient(ingredient), formatRecipe(recipe.recipe), recipe.liquid && formatStack(recipe.liquid), recipe.ticks, recipe.top && formatIngredient(recipe.top));
+const addCarpenter = (recipe) => {
+  const out = formatArgs(formatIngredient(recipe.out), formatRecipe(recipe.recipe), recipe.liquid && formatStack(recipe.liquid), recipe.ticks, recipe.top && formatIngredient(recipe.top));
   return `mods.forestry.Carpenter.addRecipe(${out});`;
 };
 const removeCarpenter = (id, liquid) => `mods.forestry.Carpenter.removeRecipe(${formatArgs(id, liquid)});`;
-const addCentrifuge = (ingredients, recipe) => {
-  const out = formatArgs(ingredients.map((ingredient) => isObject(ingredient) ? `${ingredient.id} % ${ingredient.n}` : ingredient), recipe.in, recipe.ticks);
+const addCentrifuge = (recipe) => {
+  const out = formatArgs(recipe.out.map((ingredient) => isObject(ingredient) ? `${ingredient.id} % ${ingredient.n}` : ingredient), recipe.in, recipe.ticks);
   return `mods.forestry.Centrifuge.addRecipe(${out});`;
 };
 const removeCentrifuge = (id) => `mods.forestry.Centrifuge.removeRecipe(${id});`;
@@ -250,8 +254,8 @@ const addFermenterFuel = (recipe) => {
 };
 const removeFermenterFuel = (id) => `mods.forestry.Fermenter.removeFuel(${id});`;
 const removeMoistener = (id) => `mods.forestry.Moistener.removeRecipe(${id});`;
-const addSqueezer = (liquid, recipe) => {
-  const out = formatArgs(formatStack(liquid), formatIngredient(recipe.bonus), recipe.in.map(formatIngredient), recipe.ticks);
+const addSqueezer = (recipe) => {
+  const out = formatArgs(formatStack(recipe.out), formatIngredient(recipe.bonus), recipe.in.map(formatIngredient), recipe.ticks);
   return `mods.forestry.Squeezer.addRecipe(${out});`;
 };
 const removeSqueezer = (recipe) => {
@@ -259,8 +263,8 @@ const removeSqueezer = (recipe) => {
     return `mods.forestry.Squeezer.removeRecipe(${recipe});`;
   return `mods.forestry.Squeezer.removeRecipe(${formatArgs(recipe.out, recipe.in)});`;
 };
-const addStill = (liquid, recipe) => {
-  const out = formatArgs(formatStack(liquid), formatStack(recipe.liquid), recipe.ticks);
+const addStill = (recipe) => {
+  const out = formatArgs(formatStack(recipe.out), formatStack(recipe.in), recipe.ticks);
   return `mods.forestry.Still.addRecipe(${out});`;
 };
 const removeStill = (recipe) => {
@@ -268,8 +272,8 @@ const removeStill = (recipe) => {
     return `mods.forestry.Still.removeRecipe(${recipe});`;
   return `mods.forestry.Still.removeRecipe(${formatArgs(recipe.out, recipe.in)});`;
 };
-const addFabricator = (id, recipe) => {
-  const out = formatArgs(id, recipe.in, recipe.mb, recipe.cast);
+const addFabricator = (recipe) => {
+  const out = formatArgs(formatIngredient(recipe.out), formatRecipe(recipe.recipe), recipe.mb, recipe.cast);
   return `mods.forestry.ThermionicFabricator.addCast(${out});`;
 };
 const removeFabricator = (id) => `mods.forestry.ThermionicFabricator.removeCast(${id});`;

package/dist/zenflow.d.ts

@@ -109,7 +109,7 @@ declare const addInscriber: (recipe: RecipeInscriber) => string;
 declare const removeInscriber: (id: string) => string;
 
 declare type RecipeCompressor = {
-    in: Stack;
+    in: Ingredient;
     out: string;
 };
 declare type RecipeExtreme = [
@@ -179,13 +179,15 @@ declare const removeQED: (id: string) => string;
 declare const replaceQED: (ingredient: Ingredient, recipe: RecipeShaped) => string;
 
 declare type RecipeCarpenter = {
+    out: Ingredient;
     recipe: RecipeShaped;
-    top?: Ingredient;
     ticks: number;
+    top?: Ingredient;
     liquid?: Stack;
 };
 declare type RecipeCentrifuge = {
     in: string;
+    out: Ingredient[];
     ticks: number;
 };
 declare type RecipeFermenter = {
@@ -199,16 +201,19 @@ declare type RecipeFermenterFuel = {
     burn: number;
 };
 declare type RecipeSqueezer = {
+    out: Stack;
     in: Ingredient[];
     bonus: Ingredient;
     ticks: number;
 };
 declare type RecipeStill = {
-    liquid: Stack;
+    in: Stack;
+    out: Stack;
     ticks: number;
 };
 declare type RecipeFabricator = {
-    in: string[];
+    out: Ingredient;
+    recipe: RecipeShaped;
     mb: number;
     cast?: string;
 };
@@ -217,16 +222,16 @@ declare type RecipeFabricatorFuel = {
     mb: number;
     temp: number;
 };
-declare const addCarpenter: (ingredient: Ingredient, recipe: RecipeCarpenter) => string;
+declare const addCarpenter: (recipe: RecipeCarpenter) => string;
 declare const removeCarpenter: (id: string, liquid?: string | undefined) => string;
-declare const addCentrifuge: (ingredients: Ingredient[], recipe: RecipeCentrifuge) => string;
+declare const addCentrifuge: (recipe: RecipeCentrifuge) => string;
 declare const removeCentrifuge: (id: string) => string;
 declare const addFermenter: (recipe: RecipeFermenter) => string;
 declare const removeFermenter: (id: string) => string;
 declare const addFermenterFuel: (recipe: RecipeFermenterFuel) => string;
 declare const removeFermenterFuel: (id: string) => string;
 declare const removeMoistener: (id: string) => string;
-declare const addSqueezer: (liquid: Stack, recipe: RecipeSqueezer) => string;
+declare const addSqueezer: (recipe: RecipeSqueezer) => string;
 /**
  * Remove Forestry Squeezer recipe
  *
@@ -237,7 +242,7 @@ declare const removeSqueezer: (recipe: string | {
     in: string[];
     out: string;
 }) => string;
-declare const addStill: (liquid: Stack, recipe: RecipeStill) => string;
+declare const addStill: (recipe: RecipeStill) => string;
 /**
  * Remove Forestry Still recipe
  *
@@ -248,7 +253,7 @@ declare const removeStill: (recipe: string | {
     in: string;
     out: string;
 }) => string;
-declare const addFabricator: (id: string, recipe: RecipeFabricator) => string;
+declare const addFabricator: (recipe: RecipeFabricator) => string;
 declare const removeFabricator: (id: string) => string;
 declare const addFabricatorFuel: (recipe: RecipeFabricatorFuel) => string;
 declare const removeFabricatorFuel: (id: string) => string;

package/dist/zenflow.mjs

@@ -172,7 +172,11 @@ const addInscriber = (recipe) => {
 };
 const removeInscriber = (id) => `mods.appeng.Inscriber.removeRecipe(${id});`;
 
-const addCompressor = (recipe) => `mods.avaritia.Compressor.add(${formatArgs(recipe.out, recipe.in.n, recipe.in.id)});`;
+const addCompressor = (recipe) => {
+  const input = isObject(recipe.in) ? recipe.in : { id: recipe.in, n: 1 };
+  const out = formatArgs(recipe.out, input.n, input.id);
+  return `mods.avaritia.Compressor.add(${out});`;
+};
 const removeCompressor = (id) => `mods.avaritia.Compressor.remove(${id});`;
 const addExtreme = (ingredient, recipe) => {
   const out = formatArgs(formatIngredient(ingredient), recipe.map((row) => formatList(row.map(formatId))));
@@ -225,13 +229,13 @@ const replaceQED = (ingredient, recipe) => [
   addQED(ingredient, recipe)
 ].join("\n");
 
-const addCarpenter = (ingredient, recipe) => {
-  const out = formatArgs(formatIngredient(ingredient), formatRecipe(recipe.recipe), recipe.liquid && formatStack(recipe.liquid), recipe.ticks, recipe.top && formatIngredient(recipe.top));
+const addCarpenter = (recipe) => {
+  const out = formatArgs(formatIngredient(recipe.out), formatRecipe(recipe.recipe), recipe.liquid && formatStack(recipe.liquid), recipe.ticks, recipe.top && formatIngredient(recipe.top));
   return `mods.forestry.Carpenter.addRecipe(${out});`;
 };
 const removeCarpenter = (id, liquid) => `mods.forestry.Carpenter.removeRecipe(${formatArgs(id, liquid)});`;
-const addCentrifuge = (ingredients, recipe) => {
-  const out = formatArgs(ingredients.map((ingredient) => isObject(ingredient) ? `${ingredient.id} % ${ingredient.n}` : ingredient), recipe.in, recipe.ticks);
+const addCentrifuge = (recipe) => {
+  const out = formatArgs(recipe.out.map((ingredient) => isObject(ingredient) ? `${ingredient.id} % ${ingredient.n}` : ingredient), recipe.in, recipe.ticks);
   return `mods.forestry.Centrifuge.addRecipe(${out});`;
 };
 const removeCentrifuge = (id) => `mods.forestry.Centrifuge.removeRecipe(${id});`;
@@ -246,8 +250,8 @@ const addFermenterFuel = (recipe) => {
 };
 const removeFermenterFuel = (id) => `mods.forestry.Fermenter.removeFuel(${id});`;
 const removeMoistener = (id) => `mods.forestry.Moistener.removeRecipe(${id});`;
-const addSqueezer = (liquid, recipe) => {
-  const out = formatArgs(formatStack(liquid), formatIngredient(recipe.bonus), recipe.in.map(formatIngredient), recipe.ticks);
+const addSqueezer = (recipe) => {
+  const out = formatArgs(formatStack(recipe.out), formatIngredient(recipe.bonus), recipe.in.map(formatIngredient), recipe.ticks);
   return `mods.forestry.Squeezer.addRecipe(${out});`;
 };
 const removeSqueezer = (recipe) => {
@@ -255,8 +259,8 @@ const removeSqueezer = (recipe) => {
     return `mods.forestry.Squeezer.removeRecipe(${recipe});`;
   return `mods.forestry.Squeezer.removeRecipe(${formatArgs(recipe.out, recipe.in)});`;
 };
-const addStill = (liquid, recipe) => {
-  const out = formatArgs(formatStack(liquid), formatStack(recipe.liquid), recipe.ticks);
+const addStill = (recipe) => {
+  const out = formatArgs(formatStack(recipe.out), formatStack(recipe.in), recipe.ticks);
   return `mods.forestry.Still.addRecipe(${out});`;
 };
 const removeStill = (recipe) => {
@@ -264,8 +268,8 @@ const removeStill = (recipe) => {
     return `mods.forestry.Still.removeRecipe(${recipe});`;
   return `mods.forestry.Still.removeRecipe(${formatArgs(recipe.out, recipe.in)});`;
 };
-const addFabricator = (id, recipe) => {
-  const out = formatArgs(id, recipe.in, recipe.mb, recipe.cast);
+const addFabricator = (recipe) => {
+  const out = formatArgs(formatIngredient(recipe.out), formatRecipe(recipe.recipe), recipe.mb, recipe.cast);
   return `mods.forestry.ThermionicFabricator.addCast(${out});`;
 };
 const removeFabricator = (id) => `mods.forestry.ThermionicFabricator.removeCast(${id});`;

package/package.json

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