zen-flow 4.0.0 → 4.2.0

package/dist/zenflow.cjs

@@ -1,9 +1,10 @@
 'use strict';
 
+var util = require('node:util');
+
 const isObject = (x) => typeof x === "object" && !Array.isArray(x);
 
 const formatFloat = (n) => `${n}F`;
-const formatShort = (n) => `${n} as short`;
 const formatLiteral = (x) => `"${x}"`;
 const formatId = (id) => typeof id === "string" ? id : "null";
 const formatWeight = (id, weight) => `${id}.weight(${weight})`;
@@ -56,6 +57,75 @@ const formatRecipeShaped = (recipe) => {
   }
   return formatArray(matrix.map((row) => formatArray(row.map(formatId), 3)), 2);
 };
+const createCode = (code) => `\\u00A7${code}`;
+const NAME_COLOR = {
+  black: createCode("0"),
+  darkBlue: createCode("1"),
+  darkGreen: createCode("2"),
+  darkAqua: createCode("3"),
+  darkRed: createCode("4"),
+  darkPurple: createCode("5"),
+  gold: createCode("6"),
+  gray: createCode("7"),
+  darkGray: createCode("8"),
+  blue: createCode("9"),
+  green: createCode("a"),
+  aqua: createCode("b"),
+  red: createCode("c"),
+  lightPurple: createCode("d"),
+  yellow: createCode("e"),
+  white: createCode("f")
+};
+const NAME_STYLE = {
+  obfuscated: createCode("k"),
+  bold: createCode("l"),
+  strikethrough: createCode("m"),
+  underline: createCode("n"),
+  italic: createCode("o"),
+  reset: createCode("r")
+};
+const createFormat = (type) => (tooltip) => `format.${type}(${tooltip})`;
+const TOOLTIP_COLOR = {
+  black: createFormat("black"),
+  darkBlue: createFormat("darkBlue"),
+  darkGreen: createFormat("darkGreen"),
+  darkAqua: createFormat("darkAqua"),
+  darkRed: createFormat("darkRed"),
+  darkPurple: createFormat("darkPurple"),
+  gold: createFormat("gold"),
+  gray: createFormat("gray"),
+  darkGray: createFormat("darkGray"),
+  blue: createFormat("blue"),
+  green: createFormat("green"),
+  aqua: createFormat("aqua"),
+  red: createFormat("red"),
+  lightPurple: createFormat("lightPurple"),
+  yellow: createFormat("yellow"),
+  white: createFormat("white")
+};
+const TOOLTIP_STYLE = {
+  obfuscated: createFormat("obfuscated"),
+  bold: createFormat("bold"),
+  strikethrough: createFormat("strikethrough"),
+  underline: createFormat("underline"),
+  italic: createFormat("italic")
+};
+const formatName = (...texts) => formatLiteral(texts.map((text) => {
+  if (typeof text === "string") return text;
+  return [
+    text.color && NAME_COLOR[text.color],
+    text.style && NAME_STYLE[text.style],
+    text.text,
+    (text.color ?? text.style) && NAME_STYLE.reset
+  ].filter((x) => x !== void 0).join("");
+}).join(""));
+const formatTooltip = (...tooltip) => tooltip.map((text) => {
+  if (typeof text === "string") return formatLiteral(text);
+  let out = formatLiteral(text.text);
+  if (text.style) out = TOOLTIP_STYLE[text.style](out);
+  if (text.color) out = TOOLTIP_COLOR[text.color](out);
+  return out;
+}).join(" + ");
 
 const capitalize = (x) => `${x[0].toUpperCase()}${x.slice(1)}`;
 
@@ -143,7 +213,7 @@ const createLiquid = (id, recipe) => {
     recipe.luminosity,
     recipe.temperature,
     recipe.viscosity,
-    recipe.colour,
+    recipe.color,
     !!recipe.setFire,
     recipe.castingMaterial,
     typeof recipe.texture?.still === "string" && formatLiteral(recipe.texture.still),
@@ -163,7 +233,7 @@ const createMaterial = (id, recipe) => {
     recipe.mining.speed,
     recipe.damage,
     recipe.reinforced,
-    recipe.colour,
+    recipe.color,
     recipe.value,
     recipe.handleModifier,
     recipe.stonebound,
@@ -184,7 +254,7 @@ const addComposter = (id, recipe) => {
   const out = formatArgs(
     id,
     clamp(0, 1, recipe.n),
-    typeof recipe.colour === "string" && formatLiteral(recipe.colour)
+    typeof recipe.color === "string" && formatLiteral(recipe.color)
   );
   return `mods.exnihilo.Composting.addRecipe(${out});`;
 };
@@ -325,111 +395,6 @@ const addFabricatorGlass = (id, recipe) => {
 };
 const removeFabricatorGlass = (id) => `mods.forestry.ThermionicFabricator.removeSmelting(${id});`;
 
-const withTag = (tag) => (id) => `${id}.withTag(${tag})`;
-const ENCHANTMENTS = {
-  protection: 0,
-  fireResistance: 1,
-  featherFalling: 2,
-  blastProtection: 3,
-  projectileProtection: 4,
-  respiration: 5,
-  aquaAffinity: 6,
-  thorns: 7,
-  sharpness: 16,
-  smite: 17,
-  baneOfAntrophods: 18,
-  knockback: 19,
-  fireAspect: 20,
-  looting: 21,
-  efficiency: 32,
-  silkTouch: 33,
-  unbreaking: 34,
-  fortune: 35,
-  power: 48,
-  punch: 49,
-  flame: 50,
-  infinity: 51
-};
-const formatEnchantment = (enchantment) => {
-  const id = formatShort(ENCHANTMENTS[enchantment.type]);
-  const lvl = formatShort(enchantment.level);
-  return `{ id: ${id}, lvl: ${lvl} }`;
-};
-const withEnchantment = (enchantments) => withTag(`{ ench: ${formatArray(enchantments.map(formatEnchantment), 3)} }`);
-const createCode = (code) => `\\u00A7${code}`;
-const NAME_COLOR = {
-  black: createCode("0"),
-  darkBlue: createCode("1"),
-  darkGreen: createCode("2"),
-  darkAqua: createCode("3"),
-  darkRed: createCode("4"),
-  darkPurple: createCode("5"),
-  gold: createCode("6"),
-  gray: createCode("7"),
-  darkGray: createCode("8"),
-  blue: createCode("9"),
-  green: createCode("a"),
-  aqua: createCode("b"),
-  red: createCode("c"),
-  lightPurple: createCode("d"),
-  yellow: createCode("e"),
-  white: createCode("f")
-};
-const NAME_FORMAT = {
-  obfuscated: createCode("k"),
-  bold: createCode("l"),
-  strikethrough: createCode("m"),
-  underline: createCode("n"),
-  italic: createCode("o"),
-  reset: createCode("r")
-};
-const createFormat = (type) => (tooltip) => `format.${type}(${tooltip})`;
-const TOOLTIP_COLOR = {
-  black: createFormat("black"),
-  darkBlue: createFormat("darkBlue"),
-  darkGreen: createFormat("darkGreen"),
-  darkAqua: createFormat("darkAqua"),
-  darkRed: createFormat("darkRed"),
-  darkPurple: createFormat("darkPurple"),
-  gold: createFormat("gold"),
-  gray: createFormat("gray"),
-  darkGray: createFormat("darkGray"),
-  blue: createFormat("blue"),
-  green: createFormat("green"),
-  aqua: createFormat("aqua"),
-  red: createFormat("red"),
-  lightPurple: createFormat("lightPurple"),
-  yellow: createFormat("yellow"),
-  white: createFormat("white")
-};
-const TOOLTIP_FORMAT = {
-  obfuscated: createFormat("obfuscated"),
-  bold: createFormat("bold"),
-  strikethrough: createFormat("strikethrough"),
-  underline: createFormat("underline"),
-  italic: createFormat("italic")
-};
-const formatName = (...texts) => {
-  const formatted = texts.map((text) => {
-    if (typeof text === "string") return text;
-    return [
-      text.color && NAME_COLOR[text.color],
-      text.format && NAME_FORMAT[text.format],
-      text.text,
-      (text.color ?? text.format) && NAME_FORMAT.reset
-    ].filter((x) => x !== void 0).join("");
-  }).join("");
-  return `"${formatted}"`;
-};
-const withName = (id, name) => `${id}.displayName = ${formatName(name)};`;
-const formatTooltip = (...texts) => texts.map((text) => {
-  if (typeof text === "string") return TOOLTIP_COLOR.gray(formatLiteral(text));
-  const format = text.format ? TOOLTIP_FORMAT[text.format](formatLiteral(text.text)) : formatLiteral(text.text);
-  return TOOLTIP_COLOR[text.color ?? "gray"](format);
-}).join(" + ");
-const withTooltip = (id, ...tooltips) => tooltips.map((tooltip) => `${id}.addTooltip(${formatTooltip(tooltip)});`).join("\n");
-const withTooltipShift = (id, ...tooltips) => tooltips.map((tooltip) => `${id}.addShiftTooltip(${formatTooltip(tooltip)});`).join("\n");
-
 const addChestLoot = (id, recipe) => {
   const out = formatArgs(
     formatLiteral(recipe.chest),
@@ -554,11 +519,43 @@ const hide = (id) => `mods.nei.NEI.hide(${id});`;
 const show = (id) => `mods.nei.NEI.addEntry(${id});`;
 const rename = (id, name) => `mods.nei.NEI.overrideName(${formatArgs(id, formatLiteral(name))});`;
 
-const addOreDict = (id, dict) => `${dict}.add(${id});`;
-const removeOreDict = (id, dict) => `${dict}.remove(${id});`;
+const addOreDict = (dict) => (id) => `${dict}.add(${id});`;
+const removeOreDict = (dict) => (id) => `${dict}.remove(${id});`;
 const joinOreDict = (a, b) => `${a}.addAll(${b});`;
 const mirrorOreDict = (a, b) => `${a}.mirror(${b});`;
 
+const withName = (name) => (id) => `${id}.displayName = ${formatName(name)};`;
+const withTag = (tag) => (id) => {
+  return `${id}.withTag(${util.inspect(tag)})`;
+};
+const ENCHANTMENTS = {
+  protection: 0,
+  fireProtection: 1,
+  featherFalling: 2,
+  blastProtection: 3,
+  projectileProtection: 4,
+  respiration: 5,
+  aquaAffinity: 6,
+  thorns: 7,
+  sharpness: 16,
+  smite: 17,
+  baneOfAntrophods: 18,
+  knockback: 19,
+  fireAspect: 20,
+  looting: 21,
+  efficiency: 32,
+  silkTouch: 33,
+  unbreaking: 34,
+  fortune: 35,
+  power: 48,
+  punch: 49,
+  flame: 50,
+  infinity: 51
+};
+const withEnchantment = (...enchantments) => withTag({ ench: enchantments });
+const withTooltip = (...tooltip) => (id) => `${id}.addTooltip(${formatTooltip(...tooltip)});`;
+const withTooltipShift = (...tooltip) => (id) => `${id}.addShiftTooltip(${formatTooltip(...tooltip)});`;
+
 const formatBonus = (bonus) => bonus ? [
   bonus.id,
   Math.round(bonus.chance * 100)
@@ -777,7 +774,7 @@ const setMaterialStats = (material, recipe) => {
     recipe.level.reinforced,
     recipe.level.stonebound,
     formatLiteral(recipe.style),
-    recipe.colour
+    recipe.color
   );
   return `mods.tconstruct.ToolStats.setStats(${out});`;
 };
@@ -885,6 +882,7 @@ const setArrowAccuracy = (material, accuracy) => {
   return `mods.tconstruct.TooLStats.setArrowAccuracy(${out});`;
 };
 
+exports.ENCHANTMENTS = ENCHANTMENTS;
 exports.MATERIALS = MATERIALS;
 exports.MODIFIERS = MODIFIERS;
 exports.add = add;

package/dist/zenflow.d.ts

@@ -30,6 +30,15 @@ type RecipeShaped = Partial<{
 type RecipeShapeless = string[];
 type Recipe = RecipeShaped | RecipeShapeless;
 
+type TextRich = {
+    text: string;
+    color?: typeof COLORS[number];
+    style?: typeof STYLES[number];
+};
+type Text = string | TextRich;
+declare const COLORS: readonly ["black", "darkBlue", "darkGreen", "darkAqua", "darkRed", "darkRed", "darkPurple", "gold", "gray", "darkGray", "blue", "green", "aqua", "red", "lightPurple", "yellow", "white"];
+declare const STYLES: readonly ["obfuscated", "bold", "strikethrough", "underline", "italic"];
+
 type RecipeGrinder = {
     in: string;
     turns: number;
@@ -155,7 +164,7 @@ type RecipeLiquid = {
     luminosity: number;
     temperature: number;
     viscosity: number;
-    colour: string;
+    color: string;
     setFire?: boolean;
     castingMaterial?: number;
     texture?: {
@@ -183,7 +192,7 @@ type RecipeMaterial = {
     };
     damage: number;
     reinforced: number;
-    colour: string;
+    color: string;
     value: number;
     handleModifier: number;
     stonebound: number;
@@ -212,7 +221,7 @@ declare const createMaterial: (id: string, recipe: RecipeMaterial) => string;
 
 type RecipeComposter = {
     n: number;
-    colour?: string;
+    color?: string;
 };
 /**
  * Add [Composter](https://ftb.fandom.com/wiki/Barrel_(Ex_Nihilo)) recipe
@@ -463,48 +472,6 @@ declare const addFabricatorGlass: (id: string, recipe: RecipeFabricatorGlass) =>
  */
 declare const removeFabricatorGlass: (id: string) => string;
 
-declare const withTag: (tag: string) => (id: string) => string;
-declare const ENCHANTMENTS: {
-    readonly protection: 0;
-    readonly fireResistance: 1;
-    readonly featherFalling: 2;
-    readonly blastProtection: 3;
-    readonly projectileProtection: 4;
-    readonly respiration: 5;
-    readonly aquaAffinity: 6;
-    readonly thorns: 7;
-    readonly sharpness: 16;
-    readonly smite: 17;
-    readonly baneOfAntrophods: 18;
-    readonly knockback: 19;
-    readonly fireAspect: 20;
-    readonly looting: 21;
-    readonly efficiency: 32;
-    readonly silkTouch: 33;
-    readonly unbreaking: 34;
-    readonly fortune: 35;
-    readonly power: 48;
-    readonly punch: 49;
-    readonly flame: 50;
-    readonly infinity: 51;
-};
-type Enchantment = {
-    type: keyof typeof ENCHANTMENTS;
-    level: number;
-};
-declare const withEnchantment: (enchantments: Enchantment[]) => (id: string) => string;
-declare const COLORS: readonly ["black", "darkBlue", "darkGreen", "darkAqua", "darkRed", "darkRed", "darkPurple", "gold", "gray", "darkGray", "blue", "green", "aqua", "red", "lightPurple", "yellow", "white"];
-declare const FORMATS: readonly ["obfuscated", "bold", "strikethrough", "underline", "italic"];
-type TextRich = {
-    text: string;
-    color?: typeof COLORS[number];
-    format?: typeof FORMATS[number];
-};
-type Text = string | TextRich;
-declare const withName: (id: string, name: Text) => string;
-declare const withTooltip: (id: string, ...tooltips: Text[]) => string;
-declare const withTooltipShift: (id: string, ...tooltips: Text[]) => string;
-
 type RecipeChestLoot = {
     chest: string;
     n?: number;
@@ -867,13 +834,13 @@ declare const rename: (id: string, name: string) => string;
  *
  * @see https://minetweaker3.aizistral.com/wiki/Tutorial:Ore_Dictionary
  */
-declare const addOreDict: (id: string, dict: string) => string;
+declare const addOreDict: (dict: string) => (id: string) => string;
 /**
  * Remove item from valid ore dictionary
  *
  * @see https://minetweaker3.aizistral.com/wiki/Tutorial:Ore_Dictionary
  */
-declare const removeOreDict: (id: string, dict: string) => string;
+declare const removeOreDict: (dict: string) => (id: string) => string;
 /**
  * Add all entries from `b` into `a`
  *
@@ -887,6 +854,40 @@ declare const joinOreDict: (a: string, b: string) => string;
  */
 declare const mirrorOreDict: (a: string, b: string) => string;
 
+declare const withName: (name: Text) => (id: string) => string;
+declare const withTag: (tag: Record<string, unknown>) => (id: string) => string;
+declare const ENCHANTMENTS: {
+    readonly protection: 0;
+    readonly fireProtection: 1;
+    readonly featherFalling: 2;
+    readonly blastProtection: 3;
+    readonly projectileProtection: 4;
+    readonly respiration: 5;
+    readonly aquaAffinity: 6;
+    readonly thorns: 7;
+    readonly sharpness: 16;
+    readonly smite: 17;
+    readonly baneOfAntrophods: 18;
+    readonly knockback: 19;
+    readonly fireAspect: 20;
+    readonly looting: 21;
+    readonly efficiency: 32;
+    readonly silkTouch: 33;
+    readonly unbreaking: 34;
+    readonly fortune: 35;
+    readonly power: 48;
+    readonly punch: 49;
+    readonly flame: 50;
+    readonly infinity: 51;
+};
+type Enchantment = {
+    id: number;
+    lvl: number;
+};
+declare const withEnchantment: (...enchantments: Enchantment[]) => (id: string) => string;
+declare const withTooltip: (...tooltip: Text[]) => (id: string) => string;
+declare const withTooltipShift: (...tooltip: Text[]) => (id: string) => string;
+
 type RecipeMagmaCrucible = {
     rf: number;
     input: string;
@@ -1334,7 +1335,7 @@ declare const removeRepairMaterial: (id: string, material?: string) => string;
 type RecipeToolStats = {
     name: string;
     style: string;
-    colour: string;
+    color: string;
     durability: number;
     speed: number;
     damage: number;
@@ -1531,4 +1532,4 @@ declare const setArrowBreakChance: (material: string, breakChance: number) => st
  */
 declare const setArrowAccuracy: (material: string, accuracy: number) => string;
 
-export { type Bonus, type Cast, type Enchantment, type Ingredient, MATERIALS, MODIFIERS, type Recipe, type RecipeArrowStats, type RecipeBlock, type RecipeBowStats, type RecipeCarpenter, type RecipeCastingBasin, type RecipeCastingTable, type RecipeCentrifuge, type RecipeChestLoot, type RecipeComposter, type RecipeCompressor, type RecipeDryingRack, type RecipeExtreme, type RecipeFabricator, type RecipeFabricatorGlass, type RecipeFermenter, type RecipeFermenterFuel, type RecipeFurnace, type RecipeGrinder, type RecipeHammer, type RecipeHarvester, type RecipeInductionSmelter, type RecipeInscriber, type RecipeInsolator, type RecipeItem, type RecipeLaser, type RecipeLiquid, type RecipeMagmaCrucible, type RecipeMaterial, type RecipeMoistener, type RecipePulverizer, type RecipeRedstoneFurnace, type RecipeRepairMaterial, type RecipeSawmill, type RecipeShaped, type RecipeShapeless, type RecipeSieve, type RecipeSmelteryFluid, type RecipeSmelteryFuel, type RecipeSqueezer, type RecipeStill, type RecipeToolStats, type RecipeTransposerExtract, type RecipeTransposerFill, type Stack, type Text, type TextRich, add, addBiomeRubberTree, addBlacklistAutospawner, addCarpenter, addCastingBasin, addCastingTable, addCentrifuge, addChestLoot, addComposter, addCompressor, addCrucible, addCrucibleFuel, addDryingRack, addExtreme, addFabricator, addFabricatorGlass, addFermenter, addFermenterFuel, addFurnace, addFurnaceFuel, addGrinder, addHammer, addHarvester, addInductionSmelter, addInscriber, addInsolator, addLaser, addLaserFoci, addLaserOre, addMagmaCrucible, addMirror, addMoistener, addOreDict, addPlanter, addPulverizer, addQED, addRedstoneFurnace, addRepairMaterial, addSawmill, addSeed, addShaped, addShapeless, addSieve, addSludgeBoiler, addSmelteryAlloy, addSmelteryFluid, addSmelteryFuel, addSqueezer, addStill, addTransposerExtract, addTransposerFill, createBlock, createItem, createLiquid, createMaterial, hide, joinOreDict, mirrorOreDict, remove, removeBiomeRubberTree, removeBlacklistAutospawner, removeCarpenter, removeCastingBasin, removeCastingTable, removeCentrifuge, removeChestLoot, removeComposter, removeCompressor, removeCrucible, removeCrucibleFuel, removeDryingRack, removeExtreme, removeFabricator, removeFabricatorGlass, removeFermenter, removeFermenterFuel, removeFurnace, removeFurnaceFuel, removeGrinder, removeHammer, removeInductionSmelter, removeInscriber, removeInsolator, removeLaserFoci, removeLaserOre, removeMagmaCrucible, removeModifier, removeMoistener, removeOreDict, removePulverizer, removeQED, removeRedstoneFurnace, removeRepairMaterial, removeSawmill, removeSeed, removeShaped, removeShapeless, removeSieve, removeSludgeBoiler, removeSmelteryAlloy, removeSmelteryFluid, removeSmelteryFuel, removeSqueezer, removeStill, removeTransposerExtract, removeTransposerFill, rename, setArrowAccuracy, setArrowBreakChance, setArrowMass, setArrowStats, setBowMaterialDrawspeed, setBowMaterialDurability, setBowMaterialFlightSpeed, setBowMaterialStats, setMaterialAbility, setMaterialDamage, setMaterialDurability, setMaterialHandleModifier, setMaterialLevelStonebound, setMaterialMiningLevel, setMaterialName, setMaterialReinforcedLevel, setMaterialSpeed, setMaterialStats, setMaterialStyle, show, withEnchantment, withName, withTag, withTooltip, withTooltipShift };
+export { type Bonus, type Cast, ENCHANTMENTS, type Enchantment, type Ingredient, MATERIALS, MODIFIERS, type Recipe, type RecipeArrowStats, type RecipeBlock, type RecipeBowStats, type RecipeCarpenter, type RecipeCastingBasin, type RecipeCastingTable, type RecipeCentrifuge, type RecipeChestLoot, type RecipeComposter, type RecipeCompressor, type RecipeDryingRack, type RecipeExtreme, type RecipeFabricator, type RecipeFabricatorGlass, type RecipeFermenter, type RecipeFermenterFuel, type RecipeFurnace, type RecipeGrinder, type RecipeHammer, type RecipeHarvester, type RecipeInductionSmelter, type RecipeInscriber, type RecipeInsolator, type RecipeItem, type RecipeLaser, type RecipeLiquid, type RecipeMagmaCrucible, type RecipeMaterial, type RecipeMoistener, type RecipePulverizer, type RecipeRedstoneFurnace, type RecipeRepairMaterial, type RecipeSawmill, type RecipeShaped, type RecipeShapeless, type RecipeSieve, type RecipeSmelteryFluid, type RecipeSmelteryFuel, type RecipeSqueezer, type RecipeStill, type RecipeToolStats, type RecipeTransposerExtract, type RecipeTransposerFill, type Stack, type Text, type TextRich, add, addBiomeRubberTree, addBlacklistAutospawner, addCarpenter, addCastingBasin, addCastingTable, addCentrifuge, addChestLoot, addComposter, addCompressor, addCrucible, addCrucibleFuel, addDryingRack, addExtreme, addFabricator, addFabricatorGlass, addFermenter, addFermenterFuel, addFurnace, addFurnaceFuel, addGrinder, addHammer, addHarvester, addInductionSmelter, addInscriber, addInsolator, addLaser, addLaserFoci, addLaserOre, addMagmaCrucible, addMirror, addMoistener, addOreDict, addPlanter, addPulverizer, addQED, addRedstoneFurnace, addRepairMaterial, addSawmill, addSeed, addShaped, addShapeless, addSieve, addSludgeBoiler, addSmelteryAlloy, addSmelteryFluid, addSmelteryFuel, addSqueezer, addStill, addTransposerExtract, addTransposerFill, createBlock, createItem, createLiquid, createMaterial, hide, joinOreDict, mirrorOreDict, remove, removeBiomeRubberTree, removeBlacklistAutospawner, removeCarpenter, removeCastingBasin, removeCastingTable, removeCentrifuge, removeChestLoot, removeComposter, removeCompressor, removeCrucible, removeCrucibleFuel, removeDryingRack, removeExtreme, removeFabricator, removeFabricatorGlass, removeFermenter, removeFermenterFuel, removeFurnace, removeFurnaceFuel, removeGrinder, removeHammer, removeInductionSmelter, removeInscriber, removeInsolator, removeLaserFoci, removeLaserOre, removeMagmaCrucible, removeModifier, removeMoistener, removeOreDict, removePulverizer, removeQED, removeRedstoneFurnace, removeRepairMaterial, removeSawmill, removeSeed, removeShaped, removeShapeless, removeSieve, removeSludgeBoiler, removeSmelteryAlloy, removeSmelteryFluid, removeSmelteryFuel, removeSqueezer, removeStill, removeTransposerExtract, removeTransposerFill, rename, setArrowAccuracy, setArrowBreakChance, setArrowMass, setArrowStats, setBowMaterialDrawspeed, setBowMaterialDurability, setBowMaterialFlightSpeed, setBowMaterialStats, setMaterialAbility, setMaterialDamage, setMaterialDurability, setMaterialHandleModifier, setMaterialLevelStonebound, setMaterialMiningLevel, setMaterialName, setMaterialReinforcedLevel, setMaterialSpeed, setMaterialStats, setMaterialStyle, show, withEnchantment, withName, withTag, withTooltip, withTooltipShift };

package/dist/zenflow.mjs

@@ -1,7 +1,8 @@
+import util from 'node:util';
+
 const isObject = (x) => typeof x === "object" && !Array.isArray(x);
 
 const formatFloat = (n) => `${n}F`;
-const formatShort = (n) => `${n} as short`;
 const formatLiteral = (x) => `"${x}"`;
 const formatId = (id) => typeof id === "string" ? id : "null";
 const formatWeight = (id, weight) => `${id}.weight(${weight})`;
@@ -54,6 +55,75 @@ const formatRecipeShaped = (recipe) => {
   }
   return formatArray(matrix.map((row) => formatArray(row.map(formatId), 3)), 2);
 };
+const createCode = (code) => `\\u00A7${code}`;
+const NAME_COLOR = {
+  black: createCode("0"),
+  darkBlue: createCode("1"),
+  darkGreen: createCode("2"),
+  darkAqua: createCode("3"),
+  darkRed: createCode("4"),
+  darkPurple: createCode("5"),
+  gold: createCode("6"),
+  gray: createCode("7"),
+  darkGray: createCode("8"),
+  blue: createCode("9"),
+  green: createCode("a"),
+  aqua: createCode("b"),
+  red: createCode("c"),
+  lightPurple: createCode("d"),
+  yellow: createCode("e"),
+  white: createCode("f")
+};
+const NAME_STYLE = {
+  obfuscated: createCode("k"),
+  bold: createCode("l"),
+  strikethrough: createCode("m"),
+  underline: createCode("n"),
+  italic: createCode("o"),
+  reset: createCode("r")
+};
+const createFormat = (type) => (tooltip) => `format.${type}(${tooltip})`;
+const TOOLTIP_COLOR = {
+  black: createFormat("black"),
+  darkBlue: createFormat("darkBlue"),
+  darkGreen: createFormat("darkGreen"),
+  darkAqua: createFormat("darkAqua"),
+  darkRed: createFormat("darkRed"),
+  darkPurple: createFormat("darkPurple"),
+  gold: createFormat("gold"),
+  gray: createFormat("gray"),
+  darkGray: createFormat("darkGray"),
+  blue: createFormat("blue"),
+  green: createFormat("green"),
+  aqua: createFormat("aqua"),
+  red: createFormat("red"),
+  lightPurple: createFormat("lightPurple"),
+  yellow: createFormat("yellow"),
+  white: createFormat("white")
+};
+const TOOLTIP_STYLE = {
+  obfuscated: createFormat("obfuscated"),
+  bold: createFormat("bold"),
+  strikethrough: createFormat("strikethrough"),
+  underline: createFormat("underline"),
+  italic: createFormat("italic")
+};
+const formatName = (...texts) => formatLiteral(texts.map((text) => {
+  if (typeof text === "string") return text;
+  return [
+    text.color && NAME_COLOR[text.color],
+    text.style && NAME_STYLE[text.style],
+    text.text,
+    (text.color ?? text.style) && NAME_STYLE.reset
+  ].filter((x) => x !== void 0).join("");
+}).join(""));
+const formatTooltip = (...tooltip) => tooltip.map((text) => {
+  if (typeof text === "string") return formatLiteral(text);
+  let out = formatLiteral(text.text);
+  if (text.style) out = TOOLTIP_STYLE[text.style](out);
+  if (text.color) out = TOOLTIP_COLOR[text.color](out);
+  return out;
+}).join(" + ");
 
 const capitalize = (x) => `${x[0].toUpperCase()}${x.slice(1)}`;
 
@@ -141,7 +211,7 @@ const createLiquid = (id, recipe) => {
     recipe.luminosity,
     recipe.temperature,
     recipe.viscosity,
-    recipe.colour,
+    recipe.color,
     !!recipe.setFire,
     recipe.castingMaterial,
     typeof recipe.texture?.still === "string" && formatLiteral(recipe.texture.still),
@@ -161,7 +231,7 @@ const createMaterial = (id, recipe) => {
     recipe.mining.speed,
     recipe.damage,
     recipe.reinforced,
-    recipe.colour,
+    recipe.color,
     recipe.value,
     recipe.handleModifier,
     recipe.stonebound,
@@ -182,7 +252,7 @@ const addComposter = (id, recipe) => {
   const out = formatArgs(
     id,
     clamp(0, 1, recipe.n),
-    typeof recipe.colour === "string" && formatLiteral(recipe.colour)
+    typeof recipe.color === "string" && formatLiteral(recipe.color)
   );
   return `mods.exnihilo.Composting.addRecipe(${out});`;
 };
@@ -323,111 +393,6 @@ const addFabricatorGlass = (id, recipe) => {
 };
 const removeFabricatorGlass = (id) => `mods.forestry.ThermionicFabricator.removeSmelting(${id});`;
 
-const withTag = (tag) => (id) => `${id}.withTag(${tag})`;
-const ENCHANTMENTS = {
-  protection: 0,
-  fireResistance: 1,
-  featherFalling: 2,
-  blastProtection: 3,
-  projectileProtection: 4,
-  respiration: 5,
-  aquaAffinity: 6,
-  thorns: 7,
-  sharpness: 16,
-  smite: 17,
-  baneOfAntrophods: 18,
-  knockback: 19,
-  fireAspect: 20,
-  looting: 21,
-  efficiency: 32,
-  silkTouch: 33,
-  unbreaking: 34,
-  fortune: 35,
-  power: 48,
-  punch: 49,
-  flame: 50,
-  infinity: 51
-};
-const formatEnchantment = (enchantment) => {
-  const id = formatShort(ENCHANTMENTS[enchantment.type]);
-  const lvl = formatShort(enchantment.level);
-  return `{ id: ${id}, lvl: ${lvl} }`;
-};
-const withEnchantment = (enchantments) => withTag(`{ ench: ${formatArray(enchantments.map(formatEnchantment), 3)} }`);
-const createCode = (code) => `\\u00A7${code}`;
-const NAME_COLOR = {
-  black: createCode("0"),
-  darkBlue: createCode("1"),
-  darkGreen: createCode("2"),
-  darkAqua: createCode("3"),
-  darkRed: createCode("4"),
-  darkPurple: createCode("5"),
-  gold: createCode("6"),
-  gray: createCode("7"),
-  darkGray: createCode("8"),
-  blue: createCode("9"),
-  green: createCode("a"),
-  aqua: createCode("b"),
-  red: createCode("c"),
-  lightPurple: createCode("d"),
-  yellow: createCode("e"),
-  white: createCode("f")
-};
-const NAME_FORMAT = {
-  obfuscated: createCode("k"),
-  bold: createCode("l"),
-  strikethrough: createCode("m"),
-  underline: createCode("n"),
-  italic: createCode("o"),
-  reset: createCode("r")
-};
-const createFormat = (type) => (tooltip) => `format.${type}(${tooltip})`;
-const TOOLTIP_COLOR = {
-  black: createFormat("black"),
-  darkBlue: createFormat("darkBlue"),
-  darkGreen: createFormat("darkGreen"),
-  darkAqua: createFormat("darkAqua"),
-  darkRed: createFormat("darkRed"),
-  darkPurple: createFormat("darkPurple"),
-  gold: createFormat("gold"),
-  gray: createFormat("gray"),
-  darkGray: createFormat("darkGray"),
-  blue: createFormat("blue"),
-  green: createFormat("green"),
-  aqua: createFormat("aqua"),
-  red: createFormat("red"),
-  lightPurple: createFormat("lightPurple"),
-  yellow: createFormat("yellow"),
-  white: createFormat("white")
-};
-const TOOLTIP_FORMAT = {
-  obfuscated: createFormat("obfuscated"),
-  bold: createFormat("bold"),
-  strikethrough: createFormat("strikethrough"),
-  underline: createFormat("underline"),
-  italic: createFormat("italic")
-};
-const formatName = (...texts) => {
-  const formatted = texts.map((text) => {
-    if (typeof text === "string") return text;
-    return [
-      text.color && NAME_COLOR[text.color],
-      text.format && NAME_FORMAT[text.format],
-      text.text,
-      (text.color ?? text.format) && NAME_FORMAT.reset
-    ].filter((x) => x !== void 0).join("");
-  }).join("");
-  return `"${formatted}"`;
-};
-const withName = (id, name) => `${id}.displayName = ${formatName(name)};`;
-const formatTooltip = (...texts) => texts.map((text) => {
-  if (typeof text === "string") return TOOLTIP_COLOR.gray(formatLiteral(text));
-  const format = text.format ? TOOLTIP_FORMAT[text.format](formatLiteral(text.text)) : formatLiteral(text.text);
-  return TOOLTIP_COLOR[text.color ?? "gray"](format);
-}).join(" + ");
-const withTooltip = (id, ...tooltips) => tooltips.map((tooltip) => `${id}.addTooltip(${formatTooltip(tooltip)});`).join("\n");
-const withTooltipShift = (id, ...tooltips) => tooltips.map((tooltip) => `${id}.addShiftTooltip(${formatTooltip(tooltip)});`).join("\n");
-
 const addChestLoot = (id, recipe) => {
   const out = formatArgs(
     formatLiteral(recipe.chest),
@@ -552,11 +517,43 @@ const hide = (id) => `mods.nei.NEI.hide(${id});`;
 const show = (id) => `mods.nei.NEI.addEntry(${id});`;
 const rename = (id, name) => `mods.nei.NEI.overrideName(${formatArgs(id, formatLiteral(name))});`;
 
-const addOreDict = (id, dict) => `${dict}.add(${id});`;
-const removeOreDict = (id, dict) => `${dict}.remove(${id});`;
+const addOreDict = (dict) => (id) => `${dict}.add(${id});`;
+const removeOreDict = (dict) => (id) => `${dict}.remove(${id});`;
 const joinOreDict = (a, b) => `${a}.addAll(${b});`;
 const mirrorOreDict = (a, b) => `${a}.mirror(${b});`;
 
+const withName = (name) => (id) => `${id}.displayName = ${formatName(name)};`;
+const withTag = (tag) => (id) => {
+  return `${id}.withTag(${util.inspect(tag)})`;
+};
+const ENCHANTMENTS = {
+  protection: 0,
+  fireProtection: 1,
+  featherFalling: 2,
+  blastProtection: 3,
+  projectileProtection: 4,
+  respiration: 5,
+  aquaAffinity: 6,
+  thorns: 7,
+  sharpness: 16,
+  smite: 17,
+  baneOfAntrophods: 18,
+  knockback: 19,
+  fireAspect: 20,
+  looting: 21,
+  efficiency: 32,
+  silkTouch: 33,
+  unbreaking: 34,
+  fortune: 35,
+  power: 48,
+  punch: 49,
+  flame: 50,
+  infinity: 51
+};
+const withEnchantment = (...enchantments) => withTag({ ench: enchantments });
+const withTooltip = (...tooltip) => (id) => `${id}.addTooltip(${formatTooltip(...tooltip)});`;
+const withTooltipShift = (...tooltip) => (id) => `${id}.addShiftTooltip(${formatTooltip(...tooltip)});`;
+
 const formatBonus = (bonus) => bonus ? [
   bonus.id,
   Math.round(bonus.chance * 100)
@@ -775,7 +772,7 @@ const setMaterialStats = (material, recipe) => {
     recipe.level.reinforced,
     recipe.level.stonebound,
     formatLiteral(recipe.style),
-    recipe.colour
+    recipe.color
   );
   return `mods.tconstruct.ToolStats.setStats(${out});`;
 };
@@ -883,4 +880,4 @@ const setArrowAccuracy = (material, accuracy) => {
   return `mods.tconstruct.TooLStats.setArrowAccuracy(${out});`;
 };
 
-export { MATERIALS, MODIFIERS, add, addBiomeRubberTree, addBlacklistAutospawner, addCarpenter, addCastingBasin, addCastingTable, addCentrifuge, addChestLoot, addComposter, addCompressor, addCrucible, addCrucibleFuel, addDryingRack, addExtreme, addFabricator, addFabricatorGlass, addFermenter, addFermenterFuel, addFurnace, addFurnaceFuel, addGrinder, addHammer, addHarvester, addInductionSmelter, addInscriber, addInsolator, addLaser, addLaserFoci, addLaserOre, addMagmaCrucible, addMirror, addMoistener, addOreDict, addPlanter, addPulverizer, addQED, addRedstoneFurnace, addRepairMaterial, addSawmill, addSeed, addShaped, addShapeless, addSieve, addSludgeBoiler, addSmelteryAlloy, addSmelteryFluid, addSmelteryFuel, addSqueezer, addStill, addTransposerExtract, addTransposerFill, createBlock, createItem, createLiquid, createMaterial, hide, joinOreDict, mirrorOreDict, remove, removeBiomeRubberTree, removeBlacklistAutospawner, removeCarpenter, removeCastingBasin, removeCastingTable, removeCentrifuge, removeChestLoot, removeComposter, removeCompressor, removeCrucible, removeCrucibleFuel, removeDryingRack, removeExtreme, removeFabricator, removeFabricatorGlass, removeFermenter, removeFermenterFuel, removeFurnace, removeFurnaceFuel, removeGrinder, removeHammer, removeInductionSmelter, removeInscriber, removeInsolator, removeLaserFoci, removeLaserOre, removeMagmaCrucible, removeModifier, removeMoistener, removeOreDict, removePulverizer, removeQED, removeRedstoneFurnace, removeRepairMaterial, removeSawmill, removeSeed, removeShaped, removeShapeless, removeSieve, removeSludgeBoiler, removeSmelteryAlloy, removeSmelteryFluid, removeSmelteryFuel, removeSqueezer, removeStill, removeTransposerExtract, removeTransposerFill, rename, setArrowAccuracy, setArrowBreakChance, setArrowMass, setArrowStats, setBowMaterialDrawspeed, setBowMaterialDurability, setBowMaterialFlightSpeed, setBowMaterialStats, setMaterialAbility, setMaterialDamage, setMaterialDurability, setMaterialHandleModifier, setMaterialLevelStonebound, setMaterialMiningLevel, setMaterialName, setMaterialReinforcedLevel, setMaterialSpeed, setMaterialStats, setMaterialStyle, show, withEnchantment, withName, withTag, withTooltip, withTooltipShift };
+export { ENCHANTMENTS, MATERIALS, MODIFIERS, add, addBiomeRubberTree, addBlacklistAutospawner, addCarpenter, addCastingBasin, addCastingTable, addCentrifuge, addChestLoot, addComposter, addCompressor, addCrucible, addCrucibleFuel, addDryingRack, addExtreme, addFabricator, addFabricatorGlass, addFermenter, addFermenterFuel, addFurnace, addFurnaceFuel, addGrinder, addHammer, addHarvester, addInductionSmelter, addInscriber, addInsolator, addLaser, addLaserFoci, addLaserOre, addMagmaCrucible, addMirror, addMoistener, addOreDict, addPlanter, addPulverizer, addQED, addRedstoneFurnace, addRepairMaterial, addSawmill, addSeed, addShaped, addShapeless, addSieve, addSludgeBoiler, addSmelteryAlloy, addSmelteryFluid, addSmelteryFuel, addSqueezer, addStill, addTransposerExtract, addTransposerFill, createBlock, createItem, createLiquid, createMaterial, hide, joinOreDict, mirrorOreDict, remove, removeBiomeRubberTree, removeBlacklistAutospawner, removeCarpenter, removeCastingBasin, removeCastingTable, removeCentrifuge, removeChestLoot, removeComposter, removeCompressor, removeCrucible, removeCrucibleFuel, removeDryingRack, removeExtreme, removeFabricator, removeFabricatorGlass, removeFermenter, removeFermenterFuel, removeFurnace, removeFurnaceFuel, removeGrinder, removeHammer, removeInductionSmelter, removeInscriber, removeInsolator, removeLaserFoci, removeLaserOre, removeMagmaCrucible, removeModifier, removeMoistener, removeOreDict, removePulverizer, removeQED, removeRedstoneFurnace, removeRepairMaterial, removeSawmill, removeSeed, removeShaped, removeShapeless, removeSieve, removeSludgeBoiler, removeSmelteryAlloy, removeSmelteryFluid, removeSmelteryFuel, removeSqueezer, removeStill, removeTransposerExtract, removeTransposerFill, rename, setArrowAccuracy, setArrowBreakChance, setArrowMass, setArrowStats, setBowMaterialDrawspeed, setBowMaterialDurability, setBowMaterialFlightSpeed, setBowMaterialStats, setMaterialAbility, setMaterialDamage, setMaterialDurability, setMaterialHandleModifier, setMaterialLevelStonebound, setMaterialMiningLevel, setMaterialName, setMaterialReinforcedLevel, setMaterialSpeed, setMaterialStats, setMaterialStyle, show, withEnchantment, withName, withTag, withTooltip, withTooltipShift };

package/package.json

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