zen-flow 16.3.1 → 16.4.0

package/dist/zenflow.d.ts

@@ -1813,12 +1813,77 @@ declare const removeRitualMeteor: (input: string) => string;
  */
 declare const addRitualHarvest: (output: string) => (input: string) => string;
 
+declare const ASPECT: {
+    readonly aer: "aer";
+    readonly terra: "terra";
+    readonly ignis: "ignis";
+    readonly aqua: "aqua";
+    readonly ordo: "ordo";
+    readonly perditio: "perditio";
+    readonly vacuos: "vacuos";
+    readonly lux: "lux";
+    readonly tempestas: "tempestas";
+    readonly motus: "motus";
+    readonly gelum: "gelum";
+    readonly vitreus: "vitreus";
+    readonly victus: "victus";
+    readonly venenum: "venenum";
+    readonly potentia: "potentia";
+    readonly permutatio: "permutatio";
+    readonly metallum: "metallum";
+    readonly mortuus: "mortuus";
+    readonly volatus: "volatus";
+    readonly tenebrae: "tenebrae";
+    readonly spiritus: "spiritus";
+    readonly sano: "sano";
+    readonly iter: "iter";
+    readonly alienis: "alienis";
+    readonly praecantatio: "praecantatio";
+    readonly auram: "auram";
+    readonly vitium: "vitium";
+    readonly limus: "limus";
+    readonly herba: "herba";
+    readonly arbor: "arbor";
+    readonly bestia: "bestia";
+    readonly corpus: "corpus";
+    readonly exanimis: "exanimis";
+    readonly cognitio: "cognitio";
+    readonly sensus: "sensus";
+    readonly humanus: "humanus";
+    readonly messis: "messis";
+    readonly perfodio: "perfodio";
+    readonly instrumentum: "instrumentum";
+    readonly meto: "meto";
+    readonly telum: "telum";
+    readonly tutamen: "tutamen";
+    readonly fames: "fames";
+    readonly lucrum: "lucrum";
+    readonly fabrico: "fabrico";
+    readonly pannus: "pannus";
+    readonly machina: "machina";
+    readonly vinculum: "vinculum";
+    readonly luxuria: "luxuria";
+    readonly infernus: "infernus";
+    readonly superbia: "superbia";
+    readonly gula: "gula";
+    readonly invidia: "invidia";
+    readonly desidia: "desidia";
+    readonly ira: "ira";
+};
+type AspectShaped = {
+    [ASPECT.aer]: number;
+    [ASPECT.terra]: number;
+    [ASPECT.ignis]: number;
+    [ASPECT.aqua]: number;
+    [ASPECT.ordo]: number;
+    [ASPECT.perditio]: number;
+};
 type RecipeArcane = {
     input: Shaped | Shapeless;
     output: Ingredient;
     /** Defaults to `"ASPECTS"` as this does not require research */
     research?: string;
-    aspects: Stack[];
+    aspects?: Partial<AspectShaped>;
 };
 type RecipeArcaneShaped = RecipeArcane & {
     input: Shaped;
@@ -2159,63 +2224,6 @@ declare const RESEARCH: {
         readonly focusBlink: "FOCUSBLINK";
     };
 };
-declare const ASPECT: {
-    readonly aer: "aer";
-    readonly terra: "terra";
-    readonly ignis: "ignis";
-    readonly aqua: "aqua";
-    readonly ordo: "ordo";
-    readonly perditio: "perditio";
-    readonly vacuos: "vacuos";
-    readonly lux: "lux";
-    readonly tempestas: "tempestas";
-    readonly motus: "motus";
-    readonly gelum: "gelum";
-    readonly vitreus: "vitreus";
-    readonly victus: "victus";
-    readonly venenum: "venenum";
-    readonly potentia: "potentia";
-    readonly permutatio: "permutatio";
-    readonly metallum: "metallum";
-    readonly mortuus: "mortuus";
-    readonly volatus: "volatus";
-    readonly tenebrae: "tenebrae";
-    readonly spiritus: "spiritus";
-    readonly sano: "sano";
-    readonly iter: "iter";
-    readonly alienis: "alienis";
-    readonly praecantatio: "praecantatio";
-    readonly auram: "auram";
-    readonly vitium: "vitium";
-    readonly limus: "limus";
-    readonly herba: "herba";
-    readonly arbor: "arbor";
-    readonly bestia: "bestia";
-    readonly corpus: "corpus";
-    readonly exanimis: "exanimis";
-    readonly cognitio: "cognitio";
-    readonly sensus: "sensus";
-    readonly humanus: "humanus";
-    readonly messis: "messis";
-    readonly perfodio: "perfodio";
-    readonly instrumentum: "instrumentum";
-    readonly meto: "meto";
-    readonly telum: "telum";
-    readonly tutamen: "tutamen";
-    readonly fames: "fames";
-    readonly lucrum: "lucrum";
-    readonly fabrico: "fabrico";
-    readonly pannus: "pannus";
-    readonly machina: "machina";
-    readonly vinculum: "vinculum";
-    readonly luxuria: "luxuria";
-    readonly infernus: "infernus";
-    readonly superbia: "superbia";
-    readonly gula: "gula";
-    readonly invidia: "invidia";
-    readonly desidia: "desidia";
-    readonly ira: "ira";
-};
 /**
  * Add shaped [Arcane Worktable](https://ftbwiki.org/Arcane_Worktable_(Thaumcraft_4)) recipe
  *
@@ -2646,4 +2654,4 @@ type RecipeResearchMove = {
 declare const moveResearch: (recipe: RecipeResearchMove) => string;
 
 export { ASPECT, COLOR, ENCHANTMENT, FOCI, HARVESTER_TYPE, MATERIAL, MODIFIER, RESEARCH, RESEARCH_TAB, STYLE, add, addAlchemy, addAltar, addArcane, addArcaneShaped, addArcaneShapeless, addAspectEntity, addAspectItem, addBiomeRubberTree, addBlacklistAutospawner, addBloodOrb, addBloodOrbShaped, addBloodOrbShapeless, addCarpenter, addCastingBasin, addCastingTable, addCentrifuge, addChestLoot, addComposter, addCompressor, addCrucible, addCrucibleAlchemy, addCrucibleFuel, addDryingRack, addExtreme, addFabricator, addFabricatorGlass, addFermenter, addFermenterFuel, addFurnace, addFurnaceFuel, addGrinder, addHammer, addHarvester, addInductionSmelter, addInfusion, addInfusionEnchantment, addInscriber, addInsolator, addLaserFoci, addLaserOre, addLootCommon, addLootRare, addLootUncommon, addMagmaCrucible, addMirror, addMoistener, addOreDict, addPlanter, addPress, addPulverizer, addQED, addRedstoneFurnace, addRepairMaterial, addResearch, addResearchPage, addResearchPageArcane, addResearchPageCrafting, addResearchPageCrucible, addResearchPageEnchantment, addResearchPageInfusion, addResearchRequirement, addResearchSibling, addResearchTab, addRitualBinding, addRitualHarvest, addRitualMeteor, addSawmill, addSeed, addShaped, addShapeless, addSieve, addSludgeBoiler, addSmelteryAlloy, addSmelteryFluid, addSmelteryFuel, addSqueezer, addStill, addTransposerExtract, addTransposerFill, addWarpItem, addWarpResearch, createBlock, createItem, createLiquid, createMaterial, formatResearchPage, hide, joinOreDict, mirrorOreDict, moveResearch, orphanResearch, refreshResearch, remove, removeAlchemy, removeAltar, removeArcane, removeAspectEntity, removeAspectItem, removeBiomeRubberTree, removeBlacklistAutospawner, removeCarpenter, removeCastingBasin, removeCastingTable, removeCentrifuge, removeChestLoot, removeComposter, removeCompressor, removeCrucible, removeCrucibleAlchemy, removeCrucibleFuel, removeDryingRack, removeExtreme, removeFabricator, removeFabricatorGlass, removeFermenter, removeFermenterFuel, removeFurnace, removeFurnaceFuel, removeGrinder, removeHammer, removeInductionSmelter, removeInfusion, removeInfusionEnchantment, removeInsolator, removeLaserFoci, removeLaserOre, removeLootCommon, removeLootRare, removeLootUncommon, removeMagmaCrucible, removeModifier, removeMoistener, removeOreDict, removePressInscriber, removePulverizer, removeQED, removeRedstoneFurnace, removeRepairMaterial, removeResearch, removeResearchRequirement, removeResearchSibling, removeResearchTab, removeRitualBinding, removeRitualMeteor, removeSawmill, removeSeed, removeShaped, removeShapeless, removeSieve, removeSludgeBoiler, removeSmelteryAlloy, removeSmelteryFluid, removeSmelteryFuel, removeSqueezer, removeStill, removeTransposerExtract, removeTransposerFill, removeWarp, removeWarpItem, removeWarpResearch, rename, resetResearch, setArrowAccuracy, setArrowBreakChance, setArrowMass, setArrowStats, setAspectEntity, setAspectItem, setBowMaterialDrawspeed, setBowMaterialDurability, setBowMaterialFlightSpeed, setBowMaterialStats, setLocalisation, setMaterialDamage, setMaterialDurability, setMaterialHandleModifier, setMaterialLevelStonebound, setMaterialMiningLevel, setMaterialName, setMaterialReinforcedLevel, setMaterialSpeed, setMaterialStats, setMaterialStyle, setResearchAspects, setResearchComplexity, setResearchTypeAuto, setResearchTypeHidden, setResearchTypeRound, setResearchTypeSecondary, setResearchTypeSpikey, setResearchTypeStub, setResearchTypeVirtual, show, withEnchantment, withName, withTag, withTooltip, withTooltipShift, withWeight };
-export type { ArrowStats, Bonus, BonusHammer, BowStats, Cast, ChestLoot, Enchantment, Ingredient, Liquid, MaterialStats, RecipeAlchemy, RecipeAltar, RecipeArcane, RecipeArcaneShaped, RecipeArcaneShapeless, RecipeBlock, RecipeCarpenter, RecipeCastingBasin, RecipeCastingTable, RecipeCentrifuge, RecipeComposter, RecipeCompressor, RecipeCrucibleAlchemy, RecipeDryingRack, RecipeFabricator, RecipeFabricatorGlass, RecipeFermenter, RecipeFermenterFuel, RecipeFurnace, RecipeGrinder, RecipeHarvester, RecipeInductionSmelter, RecipeInfusion, RecipeInfusionEnchantment, RecipeInsolator, RecipeItem, RecipeLaser, RecipeLiquid, RecipeMagmaCrucible, RecipeMaterial, RecipeMeteor, RecipeMoistener, RecipePressInscriber, RecipePulverizer, RecipeRedstoneFurnace, RecipeRepairMaterial, RecipeResearch, RecipeResearchMove, RecipeResearchTab, RecipeSawmill, RecipeSmelteryAlloy, RecipeSmelteryFluid, RecipeSmelteryFuel, RecipeSqueezer, RecipeStill, RecipeTransposerExtract, RecipeTransposerFill, Shaped, ShapedExtreme, Shapeless, Stack, Text, TextResearch, TextResearchImage, TextRich, Texture };
+export type { ArrowStats, AspectShaped, Bonus, BonusHammer, BowStats, Cast, ChestLoot, Enchantment, Ingredient, Liquid, MaterialStats, RecipeAlchemy, RecipeAltar, RecipeArcane, RecipeArcaneShaped, RecipeArcaneShapeless, RecipeBlock, RecipeCarpenter, RecipeCastingBasin, RecipeCastingTable, RecipeCentrifuge, RecipeComposter, RecipeCompressor, RecipeCrucibleAlchemy, RecipeDryingRack, RecipeFabricator, RecipeFabricatorGlass, RecipeFermenter, RecipeFermenterFuel, RecipeFurnace, RecipeGrinder, RecipeHarvester, RecipeInductionSmelter, RecipeInfusion, RecipeInfusionEnchantment, RecipeInsolator, RecipeItem, RecipeLaser, RecipeLiquid, RecipeMagmaCrucible, RecipeMaterial, RecipeMeteor, RecipeMoistener, RecipePressInscriber, RecipePulverizer, RecipeRedstoneFurnace, RecipeRepairMaterial, RecipeResearch, RecipeResearchMove, RecipeResearchTab, RecipeSawmill, RecipeSmelteryAlloy, RecipeSmelteryFluid, RecipeSmelteryFuel, RecipeSqueezer, RecipeStill, RecipeTransposerExtract, RecipeTransposerFill, Shaped, ShapedExtreme, Shapeless, Stack, Text, TextResearch, TextResearchImage, TextRich, Texture };

package/dist/zenflow.js

@@ -908,6 +908,67 @@ const addRitualHarvest = (output) => (input) => {
   return `mods.bloodmagic.HarvestMoon.addHarvestable(${out});`;
 };
 
+const ASPECT = {
+  aer: "aer",
+  terra: "terra",
+  ignis: "ignis",
+  aqua: "aqua",
+  ordo: "ordo",
+  perditio: "perditio",
+  vacuos: "vacuos",
+  lux: "lux",
+  tempestas: "tempestas",
+  motus: "motus",
+  gelum: "gelum",
+  vitreus: "vitreus",
+  victus: "victus",
+  venenum: "venenum",
+  potentia: "potentia",
+  permutatio: "permutatio",
+  metallum: "metallum",
+  mortuus: "mortuus",
+  volatus: "volatus",
+  tenebrae: "tenebrae",
+  spiritus: "spiritus",
+  sano: "sano",
+  iter: "iter",
+  alienis: "alienis",
+  praecantatio: "praecantatio",
+  auram: "auram",
+  vitium: "vitium",
+  limus: "limus",
+  herba: "herba",
+  arbor: "arbor",
+  bestia: "bestia",
+  corpus: "corpus",
+  exanimis: "exanimis",
+  cognitio: "cognitio",
+  sensus: "sensus",
+  humanus: "humanus",
+  messis: "messis",
+  perfodio: "perfodio",
+  instrumentum: "instrumentum",
+  meto: "meto",
+  telum: "telum",
+  tutamen: "tutamen",
+  fames: "fames",
+  lucrum: "lucrum",
+  fabrico: "fabrico",
+  pannus: "pannus",
+  machina: "machina",
+  vinculum: "vinculum",
+  luxuria: "luxuria",
+  infernus: "infernus",
+  superbia: "superbia",
+  gula: "gula",
+  invidia: "invidia",
+  desidia: "desidia",
+  ira: "ira"
+};
+const aspectShaped = (x) => {
+  const aspects = Object.entries(x).map(([id, n]) => aspect({ id, n }));
+  return literal(list()(aspects));
+};
 const RESEARCH_TAB = {
   basics: "BASICS",
   thaumaturgy: "THAUMATURGY",
@@ -1244,77 +1305,20 @@ const RESEARCH = {
     focusBlink: "FOCUSBLINK"
   }
 };
-const ASPECT = {
-  aer: "aer",
-  terra: "terra",
-  ignis: "ignis",
-  aqua: "aqua",
-  ordo: "ordo",
-  perditio: "perditio",
-  vacuos: "vacuos",
-  lux: "lux",
-  tempestas: "tempestas",
-  motus: "motus",
-  gelum: "gelum",
-  vitreus: "vitreus",
-  victus: "victus",
-  venenum: "venenum",
-  potentia: "potentia",
-  permutatio: "permutatio",
-  metallum: "metallum",
-  mortuus: "mortuus",
-  volatus: "volatus",
-  tenebrae: "tenebrae",
-  spiritus: "spiritus",
-  sano: "sano",
-  iter: "iter",
-  alienis: "alienis",
-  praecantatio: "praecantatio",
-  auram: "auram",
-  vitium: "vitium",
-  limus: "limus",
-  herba: "herba",
-  arbor: "arbor",
-  bestia: "bestia",
-  corpus: "corpus",
-  exanimis: "exanimis",
-  cognitio: "cognitio",
-  sensus: "sensus",
-  humanus: "humanus",
-  messis: "messis",
-  perfodio: "perfodio",
-  instrumentum: "instrumentum",
-  meto: "meto",
-  telum: "telum",
-  tutamen: "tutamen",
-  fames: "fames",
-  lucrum: "lucrum",
-  fabrico: "fabrico",
-  pannus: "pannus",
-  machina: "machina",
-  vinculum: "vinculum",
-  luxuria: "luxuria",
-  infernus: "infernus",
-  superbia: "superbia",
-  gula: "gula",
-  invidia: "invidia",
-  desidia: "desidia",
-  ira: "ira"
-};
 const addArcaneShaped = (recipe$1) => {
   const out = recipe(
     literal(recipe$1.research ?? RESEARCH[RESEARCH_TAB.basics].aspects),
     ingredient(recipe$1.output),
-    aspects(recipe$1.aspects),
+    maybe(aspectShaped)(recipe$1.aspects),
     shaped(recipe$1.input)
   );
   return `mods.thaumcraft.Arcane.addShaped(${out});`;
 };
 const addArcaneShapeless = (recipe$1) => {
   const out = recipe(
-    literal(recipe$1.research ?? "ASPECTS"),
+    literal(recipe$1.research ?? RESEARCH[RESEARCH_TAB.basics].aspects),
     ingredient(recipe$1.output),
-    aspects(recipe$1.aspects),
+    maybe(aspectShaped)(recipe$1.aspects),
     array(3)(recipe$1.input)
   );
   return `mods.thaumcraft.Arcane.addShapeless(${out});`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-flow",
-  "version": "16.3.1",
+  "version": "16.4.0",
   "description": "MineTweaker ZenScript made easy.",
   "type": "module",
   "exports": {