@nodecraft/rendermite 1.6.1 → 1.6.3

package/dist/{block-entities-xv3bQpEX.js → block-entities-XAynAVUE.js}

@@ -1,5 +1,5 @@
 import { n as ResourceLocator } from "./locator-COMEtEn9.js";
-import { a as findChestTexture, c as findFluidStill, i as findBedTexture, l as findMobTexture, n as HEAD_LAYOUTS, o as findEntityTexture, r as coversSheet, s as findFluidSibling, t as DYE_COLORS } from "./entity-textures-DFRIVdF1.js";
+import { a as findBedTexture, c as findFluidSibling, i as coversSheet, l as findFluidStill, n as HEAD_LAYOUTS, o as findChestTexture, s as findEntityTexture, t as DYE_COLORS, u as findMobTexture } from "./entity-textures-4XXT8jVI.js";
 //#region src/blocks/block-entities.ts
 /**
 * Geometry for blocks the game draws from Java rather than from a model.

package/dist/blocks/block-entities.js

@@ -1,2 +1,2 @@
-import { n as blockEntityGeometry, r as synthesizeVariants, t as INVISIBLE_BLOCKS } from "../block-entities-xv3bQpEX.js";
+import { n as blockEntityGeometry, r as synthesizeVariants, t as INVISIBLE_BLOCKS } from "../block-entities-XAynAVUE.js";
 export { INVISIBLE_BLOCKS, blockEntityGeometry, synthesizeVariants };

package/dist/blocks/cli.js

@@ -1,2 +1,2 @@
-import { t as runBlocksCli } from "../cli-D2KJc_yl.js";
+import { t as runBlocksCli } from "../cli-B2-DjSYI.js";
 export { runBlocksCli };

package/dist/blocks/entities.js

@@ -1,2 +1,2 @@
-import { n as entityTypesOf, t as collectEntities } from "../entities-DvmA9fEV.js";
+import { n as entityTypesOf, t as collectEntities } from "../entities-DubtdM11.js";
 export { collectEntities, entityTypesOf };

package/dist/blocks/entity-models.js

@@ -1,2 +1,2 @@
-import { t as collectEntityGeometry } from "../entity-models-_EZ3PVtN.js";
+import { t as collectEntityGeometry } from "../entity-models-D_QGok9j.js";
 export { collectEntityGeometry };

package/dist/blocks/export.js

@@ -1,2 +1,2 @@
-import { t as exportBlockPack } from "../export-BfEIwSxY.js";
+import { t as exportBlockPack } from "../export-BFcXFTX6.js";
 export { exportBlockPack };

package/dist/{cli-D2KJc_yl.js → cli-B2-DjSYI.js}

@@ -1,7 +1,7 @@
 import { n as builtinPackPath } from "./builtin-WkWjATeh.js";
 import { n as LayeredResourceManager, t as FolderResourceManager } from "./manager-BNibYkmI.js";
-import { t as exportBlockPack } from "./export-BfEIwSxY.js";
-import { n as layeredClasses, t as JarClassReader } from "./jar-classes-DCtELr1i.js";
+import { t as exportBlockPack } from "./export-BFcXFTX6.js";
+import { n as layeredClasses, t as JarClassReader } from "./jar-classes-3GVCJZT7.js";
 import { n as prepareModResources } from "./prepare-Myd_ec4v.js";
 import { t as downloadClientJar } from "./download-1wAfrGKx.js";
 import { a as prepareVersionResources, r as compareVersions } from "./prepare-D49Gu4Lv.js";

package/dist/cli.js

@@ -6,8 +6,8 @@ import { t as curatedModelOverrides } from "./models-CZjCOjs4.js";
 import { n as harvestTintOverrides, t as curatedTintOverrides } from "./tints-BspVCz2G.js";
 import { t as downloadClientJar } from "./download-1wAfrGKx.js";
 import { a as prepareVersionResources, i as eraForVersion, n as GEOMETRY_DONOR_VERSIONS } from "./prepare-D49Gu4Lv.js";
-import { t as runBlocksCli } from "./cli-D2KJc_yl.js";
-import { t as run } from "./run-BQJkqc5f.js";
+import { t as runBlocksCli } from "./cli-B2-DjSYI.js";
+import { t as run } from "./run-BXAqZ5qY.js";
 import path from "node:path";
 import os from "node:os";
 import { parseArgs } from "node:util";

package/dist/entities/inherit.js

@@ -1,2 +1,2 @@
-import { n as extractInheritedModel, t as ancestryOf } from "../inherit-ByHjOJX3.js";
+import { n as extractInheritedModel, t as ancestryOf } from "../inherit-C5Ifg3SM.js";
 export { ancestryOf, extractInheritedModel };

package/dist/entities/jar-classes.js

@@ -1,2 +1,2 @@
-import { n as layeredClasses, t as JarClassReader } from "../jar-classes-DCtELr1i.js";
+import { n as layeredClasses, t as JarClassReader } from "../jar-classes-3GVCJZT7.js";
 export { JarClassReader, layeredClasses };

package/dist/entities/merge.d.ts

@@ -12,7 +12,22 @@ declare function slotsOf(parts: Part[]): {
 declare function buildsOwnMesh(model: ExtractedModel): boolean;
 /** `base` plus the parts of `extra` that `base` does not name. */
 declare function mergeModels(base: ExtractedModel, extra: ExtractedModel): ExtractedModel;
+/**
+ * Drops boxes that land exactly where one already is.
+ *
+ * A model builder's branches are all taken, because they turn on a constructor argument this cannot
+ * know — a `CubeDeformation`, a baby-variant flag — so a model that builds one shape *or* another
+ * emits both. Where the two arms differ, that is the honest answer and the model says so in a note.
+ * Where they agree, it is four legs drawn twice in the same place: `HorseModel` builds
+ * `left_hind_leg` and `left_hind_baby_leg` at identical coordinates, and two coplanar boxes are
+ * exactly what z-fighting is.
+ *
+ * Keyed on the accumulated pivot and rotation rather than on evaluated corners, since duplicates come
+ * from one builder running twice and land on identical frames. The first is kept: a builder states the
+ * ordinary shape before the variant.
+ */
+declare function dedupeCubes(model: ExtractedModel): ExtractedModel;
 declare function countCubes(part: Part): number;
 declare function cubesOf(model: ExtractedModel): number;
 //#endregion
-export { buildsOwnMesh, countCubes, cubesOf, mergeModels, slotsOf };
+export { buildsOwnMesh, countCubes, cubesOf, dedupeCubes, mergeModels, slotsOf };

package/dist/entities/merge.js

@@ -1,2 +1,2 @@
-import { a as slotsOf, i as mergeModels, n as countCubes, r as cubesOf, t as buildsOwnMesh } from "../merge-NDYxpmL8.js";
-export { buildsOwnMesh, countCubes, cubesOf, mergeModels, slotsOf };
+import { a as mergeModels, i as dedupeCubes, n as countCubes, o as slotsOf, r as cubesOf, t as buildsOwnMesh } from "../merge-DeHruviG.js";
+export { buildsOwnMesh, countCubes, cubesOf, dedupeCubes, mergeModels, slotsOf };

package/dist/entities/model-bytecode.js

@@ -1,2 +1,2 @@
-import { t as extractModel } from "../model-bytecode-gWy5_uCj.js";
+import { t as extractModel } from "../model-bytecode-BQKCLPze.js";
 export { extractModel };

package/dist/{entities-DvmA9fEV.js → entities-DubtdM11.js}

@@ -1,5 +1,5 @@
 import { n as ResourceLocator } from "./locator-COMEtEn9.js";
-import { l as findMobTexture, u as tokens } from "./entity-textures-DFRIVdF1.js";
+import { d as isOverlayPath, f as tokens, u as findMobTexture } from "./entity-textures-4XXT8jVI.js";
 //#region src/blocks/entities.ts
 /**
 * The entity registry, and one colour per entity.
@@ -125,13 +125,17 @@ async function findVariantTexture(resources, namespace, name) {
 		if (!locator.path.startsWith("entity/")) continue;
 		const leaf = locator.path.split("/").at(-1) ?? "";
 		if (tokens(leaf).some((token) => NOT_THE_MOB.has(token))) continue;
+		if (isOverlayPath(locator.path)) continue;
 		const candidate = tokens(locator.path);
 		let score = 0;
 		for (const token of wanted) if (candidate.includes(token)) score += 2;
 		if (squashed !== name && candidate.includes(squashed)) score += wanted.length * 2;
 		if (score === 0) continue;
+		const folder = locator.path.split("/").slice(1, -1);
+		const inFamily = folder.length > 0 && folder.flatMap((segment) => tokens(segment)).every((token) => wanted.includes(token));
+		const named = tokens(leaf).some((token) => wanted.includes(token));
 		const depth = locator.path.split("/").length;
-		score = score * 10 - depth - candidate.length;
+		score = (inFamily ? 1e3 : 0) + score * 10 + (named ? 5 : 0) - depth - candidate.length;
 		if (score > bestScore) {
 			best = locator;
 			bestScore = score;

package/dist/{entity-fallback-Bth0fa7m.js → entity-fallback-BcJWh91-.js}

@@ -1,5 +1,5 @@
 import { n as ResourceLocator } from "./locator-COMEtEn9.js";
-import { a as findChestTexture, i as findBedTexture, l as findMobTexture, n as HEAD_LAYOUTS, o as findEntityTexture, r as coversSheet, t as DYE_COLORS, u as tokens } from "./entity-textures-DFRIVdF1.js";
+import { a as findBedTexture, f as tokens, i as coversSheet, n as HEAD_LAYOUTS, o as findChestTexture, s as findEntityTexture, t as DYE_COLORS, u as findMobTexture } from "./entity-textures-4XXT8jVI.js";
 import { c as renderModel } from "./obj-CJHEHpki.js";
 //#region src/render/entity-fallback.ts
 /**

package/dist/{entity-models-_EZ3PVtN.js → entity-models-D_QGok9j.js}

@@ -1,5 +1,5 @@
 import { t as findGeoForEntity } from "./entity-geo-B2CkuMWx.js";
-import { n as extractInheritedModel } from "./inherit-ByHjOJX3.js";
+import { n as extractInheritedModel } from "./inherit-C5Ifg3SM.js";
 import { a as linkEntityModel, i as classReader, r as buildModelNameIndex } from "./link-5GmBLTzk.js";
 import { s as resolveMappings, t as MappingsUnavailableError } from "./mappings-BEPVaiwE.js";
 import { n as loadModelCode } from "./model-code-1Vuk-zj_.js";

package/dist/{entity-textures-DFRIVdF1.js → entity-textures-4XXT8jVI.js}

@@ -68,6 +68,29 @@ const HEAD_LAYOUTS = {
 * live at entity/<mob>.png or entity/<mob>/<mob>.png depending on the mod, and a
 * head only ever wants the base skin — never a blink or armour overlay.
 */
+/**
+* Directories that hold an *overlay* rather than a mob.
+*
+* Matched as whole path segments rather than as tokens, because a token would take `chest_boat` out
+* along with `chest`. A trader llama is the case that needed it: its sheet is filed as
+* `entity/llama/decor/trader_llama`, whose leaf is exactly the mob's name — so a search by name found
+* the carpet it wears, which is a few opaque pixels on a transparent sheet, and the llama underneath
+* came out invisible on most of its faces.
+*/
+const OVERLAY_DIRECTORIES = /* @__PURE__ */ new Set([
+	"decor",
+	"armor",
+	"markings",
+	"glow",
+	"eyes",
+	"overlay",
+	"saddle",
+	"harness"
+]);
+/** Whether a texture is filed inside one of those, whatever the file itself is called. */
+function isOverlayPath(path) {
+	return path.split("/").slice(0, -1).some((segment) => OVERLAY_DIRECTORIES.has(segment));
+}
 async function findMobTexture(resources, namespace, mob) {
 	for (const source of [namespace, "minecraft"]) {
 		for (const candidate of [`entity/${mob}`, `entity/${mob}/${mob}`]) {
@@ -77,7 +100,7 @@ async function findMobTexture(resources, namespace, mob) {
 		let best = null;
 		for (const locator of await resources.listResources("texture", source)) {
 			const leaf = locator.path.split("/").pop();
-			if (!locator.path.startsWith("entity/") || leaf !== mob) continue;
+			if (!locator.path.startsWith("entity/") || leaf !== mob || isOverlayPath(locator.path)) continue;
 			if (best === null || locator.path.length < best.path.length) best = locator;
 		}
 		if (best) return best;
@@ -206,4 +229,4 @@ async function findFluidSibling(resources, still, suffixes) {
 	return null;
 }
 //#endregion
-export { findChestTexture as a, findFluidStill as c, findBedTexture as i, findMobTexture as l, HEAD_LAYOUTS as n, findEntityTexture as o, coversSheet as r, findFluidSibling as s, DYE_COLORS as t, tokens as u };
+export { findBedTexture as a, findFluidSibling as c, isOverlayPath as d, tokens as f, coversSheet as i, findFluidStill as l, HEAD_LAYOUTS as n, findChestTexture as o, OVERLAY_DIRECTORIES as r, findEntityTexture as s, DYE_COLORS as t, findMobTexture as u };

package/dist/{export-BfEIwSxY.js → export-BFcXFTX6.js}

@@ -1,9 +1,9 @@
 import { r as buildBiomeClimates } from "./biomes-5ZwYxMYe.js";
 import { n as ResourceLocator } from "./locator-COMEtEn9.js";
-import { n as blockEntityGeometry, r as synthesizeVariants, t as INVISIBLE_BLOCKS } from "./block-entities-xv3bQpEX.js";
+import { n as blockEntityGeometry, r as synthesizeVariants, t as INVISIBLE_BLOCKS } from "./block-entities-XAynAVUE.js";
 import { a as parseBlockState, n as collectModels } from "./blockstate-eval-BRQ3NWY2.js";
-import { t as collectEntities } from "./entities-DvmA9fEV.js";
-import { t as collectEntityGeometry } from "./entity-models-_EZ3PVtN.js";
+import { t as collectEntities } from "./entities-DubtdM11.js";
+import { t as collectEntityGeometry } from "./entity-models-D_QGok9j.js";
 import { n as discoverItems } from "./discovery-CD0QqxSF.js";
 import { a as salvageJson, i as resolveTexture, t as ModelLoader } from "./loader-C-NuJaEi.js";
 import { t as collectItemSprites } from "./item-sprites-G-yikdfV.js";
@@ -70,6 +70,29 @@ const FLUID_SUFFIX = /_(?:still|flow|flowing)$/;
 /** Sampled where water meets a non-opaque neighbour; matches no suffix. */
 const EXTRA_FLUID_SPRITES = ["minecraft:block/water_overlay"];
 /**
+* Sprites selected by block-entity NBT rather than by a JSON blockstate/model graph.
+*
+* AE2's cable bus is assembled in Java from a saved cable plus zero or more face parts. Its JSON
+* models are therefore unreachable from `collectModels`, even though a consumer has enough NBT to
+* reconstruct it. Keep the small, stable texture vocabulary in the atlas for that renderer.
+*/
+const DYNAMIC_BLOCK_ENTITY_SPRITES = { ae2: [
+	"ae2:part/cable/glass/transparent",
+	"ae2:part/cable/covered/transparent",
+	"ae2:part/cable/smart/transparent",
+	"ae2:part/cable/dense_covered/transparent",
+	"ae2:part/cable/dense_smart/transparent",
+	"ae2:part/storage_bus",
+	"ae2:part/storage_bus_back",
+	"ae2:part/storage_bus_sides",
+	"ae2:part/import_bus",
+	"ae2:part/import_bus_sides",
+	"ae2:part/export_bus",
+	"ae2:part/export_bus_sides",
+	"ae2:part/monitor_back",
+	"ae2:part/monitor_sides_status"
+] };
+/**
 * Vanilla's `BlockElement.uvsByFace`: the UV a face gets when the model states
 * none. Deliberately not `render/geometry.ts`'s auto-UVs — those are in the
 * rasterizer's own unflipped convention, and the pack has to speak the same
@@ -575,6 +598,7 @@ async function exportBlockPack(options) {
 	}
 	for (const namespace of namespaces) for (const locator of await resources.listResources("texture", namespace)) if (FLUID_SUFFIX.test(locator.path)) spriteIds.add(locator.toString());
 	for (const extra of EXTRA_FLUID_SPRITES) if (await resources.hasResource("texture", ResourceLocator.parse(extra))) spriteIds.add(extra);
+	for (const namespace of namespaces) for (const extra of DYNAMIC_BLOCK_ENTITY_SPRITES[namespace] ?? []) if (await resources.hasResource("texture", ResourceLocator.parse(extra))) spriteIds.add(extra);
 	const sheet = await buildSpriteSheet(spriteIds, textures, {
 		padding: options.padding,
 		maxPageSize: options.maxPageSize,

package/dist/index.js

@@ -14,7 +14,7 @@ import { n as buildBlockTints, t as UNREGISTERED_TINTS } from "./tints-Cl0r-Ol3.
 import { o as createAtlasResolver, s as parseAtlasSources, t as AtlasSourceError } from "./sources-BlUriDCs.js";
 import { n as LayeredResourceManager, r as ResourceKind, t as FolderResourceManager } from "./manager-BNibYkmI.js";
 import { n as TextureLoader, r as TextureResolutionError, t as AnimatedTexture } from "./loader-C18GpurU.js";
-import { t as exportBlockPack } from "./export-BfEIwSxY.js";
+import { t as exportBlockPack } from "./export-BFcXFTX6.js";
 import { n as UnsafeJarError, r as isUnsafeEntryPath, t as JarResourceManager } from "./jar-W2cV2ZVO.js";
 import { n as prepareModResources } from "./prepare-Myd_ec4v.js";
 import { a as prepareVersionResources, i as eraForVersion, r as compareVersions } from "./prepare-D49Gu4Lv.js";
@@ -22,5 +22,5 @@ import { n as encodeIcon, t as encodeAnimatedIcon } from "./encode-LR9wxigC.js";
 import { a as builtinDynamicResources } from "./generators-BCZVlWig.js";
 import { t as minifyStylesheet } from "./minify-bjMRmr5J.js";
 import { n as itemClass, t as generateStylesheet } from "./stylesheet-CovT3B2S.js";
-import { t as run } from "./run-BQJkqc5f.js";
+import { t as run } from "./run-BXAqZ5qY.js";
 export { AnimatedTexture, AtlasSourceError, BlockStateError, DEFAULT_WATER_COLOR, DYE_COLORS, FolderResourceManager, InvalidItemDefinitionError, InvalidResourceLocatorError, InvalidTinterDefinitionError, ItemRenderError, ItemResolutionError, JarResourceManager, LayeredResourceManager, LightingProfile, ModelLoader, ModelResolutionError, ObjMeshError, ResourceKind, ResourceLocator, TextureLoader, TextureResolutionError, UNKNOWN_MODEL, UNREGISTERED_TINTS, UnsafeJarError, VANILLA_BIOME_CLIMATES, boxDownscale, buildBiomeClimates, buildBlockTints, buildObjMesh, builtinDynamicResources, collectModels, compareVersions, createAtlasResolver, defaultProperties, discoverItems, encodeAnimatedIcon, encodeIcon, eraForVersion, evaluateBlockState, evaluateItemModel, exportBlockPack, generateStylesheet, isUnsafeEntryPath, itemClass, lightsForProfile, matchesCondition, minifyStylesheet, packAtlas, parseAtlasSources, parseBiomeClimate, parseBlockState, parseTintValue, pointResize, prepareModResources, prepareVersionResources, renderModel, renderModelFrames, resolveItem, resolveTexture, resolveTint, resolveTints, run, salvageJson, toByteTexture, toFloatTexture, weightedVariantIndex };

package/dist/{inherit-ByHjOJX3.js → inherit-C5Ifg3SM.js}

@@ -1,6 +1,6 @@
 import { t as parseClassFile } from "./classfile-Bo7FUrrD.js";
-import { i as mergeModels } from "./merge-NDYxpmL8.js";
-import { t as extractModel } from "./model-bytecode-gWy5_uCj.js";
+import { a as mergeModels, i as dedupeCubes } from "./merge-DeHruviG.js";
+import { t as extractModel } from "./model-bytecode-BQKCLPze.js";
 //#region src/entities/inherit.ts
 /**
 * A model class read together with its ancestors.
@@ -71,7 +71,7 @@ async function extractInheritedModel(internalName, read, code) {
 		});
 		model = mergeModels(model, inheritedModel);
 	}
-	return model;
+	return dedupeCubes(model);
 }
 //#endregion
 export { extractInheritedModel as n, ancestryOf as t };

package/dist/{jar-classes-DCtELr1i.js → jar-classes-3GVCJZT7.js}

@@ -25,18 +25,28 @@ function layeredClasses(sources) {
 	return {
 		list: async () => {
 			const names = /* @__PURE__ */ new Set();
-			for (const source of sources) for (const name of await source.list()) names.add(name);
+			for (const source of sources) try {
+				for (const name of await source.list()) names.add(name);
+			} catch {
+				continue;
+			}
 			return [...names];
 		},
 		read: async (internalName) => {
-			for (const source of sources) {
+			for (const source of sources) try {
 				const bytes = await source.read(internalName);
 				if (bytes) return bytes;
+			} catch {
+				continue;
 			}
 			return null;
 		},
 		close: async () => {
-			for (const source of sources) await source.close();
+			for (const source of sources) try {
+				await source.close();
+			} catch {
+				continue;
+			}
 		}
 	};
 }

package/dist/merge-DeHruviG.js

@@ -0,0 +1,109 @@
+//#region src/entities/merge.ts
+/** A root the interpreter had to invent, because a `MeshDefinition`'s root part is anonymous. */
+const SYNTHETIC_ROOT = /^part\d+$/;
+/**
+* Where a piece's parts sit: at the top, or inside the one anonymous root a `MeshDefinition` makes.
+* Both merge into the same list of named slots and only one of them is nested.
+*/
+function slotsOf(parts) {
+	const [only] = parts;
+	if (parts.length === 1 && only.cubes.length === 0 && SYNTHETIC_ROOT.test(only.name)) return {
+		container: only,
+		slots: only.children
+	};
+	return {
+		container: null,
+		slots: parts
+	};
+}
+/** True when this piece built its own mesh rather than adding to one it was handed. */
+function buildsOwnMesh(model) {
+	return slotsOf(model.parts).container !== null;
+}
+/** `base` plus the parts of `extra` that `base` does not name. */
+function mergeModels(base, extra) {
+	const target = slotsOf(base.parts);
+	const source = slotsOf(extra.parts);
+	const named = new Set(target.slots.map((part) => part.name));
+	const missing = source.slots.filter((part) => !named.has(part.name));
+	if (missing.length === 0) return base;
+	const parts = target.container ? [{
+		...target.container,
+		children: [...target.container.children, ...missing]
+	}] : [...target.slots, ...missing];
+	const notes = [.../* @__PURE__ */ new Set([...base.notes, ...extra.notes])].filter((note) => parts.length > 1 || !note.includes("disconnected roots"));
+	return {
+		textureSize: base.textureSize[0] === 64 && base.textureSize[1] === 32 ? extra.textureSize : base.textureSize,
+		parts,
+		notes
+	};
+}
+/**
+* Drops boxes that land exactly where one already is.
+*
+* A model builder's branches are all taken, because they turn on a constructor argument this cannot
+* know — a `CubeDeformation`, a baby-variant flag — so a model that builds one shape *or* another
+* emits both. Where the two arms differ, that is the honest answer and the model says so in a note.
+* Where they agree, it is four legs drawn twice in the same place: `HorseModel` builds
+* `left_hind_leg` and `left_hind_baby_leg` at identical coordinates, and two coplanar boxes are
+* exactly what z-fighting is.
+*
+* Keyed on the accumulated pivot and rotation rather than on evaluated corners, since duplicates come
+* from one builder running twice and land on identical frames. The first is kept: a builder states the
+* ordinary shape before the variant.
+*/
+function dedupeCubes(model) {
+	const seen = /* @__PURE__ */ new Set();
+	const round = (value) => value.toFixed(4);
+	const walk = (part, pivot, rotation) => {
+		const at = [
+			pivot[0] + part.pivot[0],
+			pivot[1] + part.pivot[1],
+			pivot[2] + part.pivot[2]
+		];
+		const spun = [
+			rotation[0] + part.rotation[0],
+			rotation[1] + part.rotation[1],
+			rotation[2] + part.rotation[2]
+		];
+		const cubes = part.cubes.filter((cube) => {
+			const key = [
+				...at.map(round),
+				...spun.map(round),
+				...cube.origin.map(round),
+				...cube.size.map(round),
+				...cube.uv.map(round),
+				round(cube.inflate)
+			].join("|");
+			if (seen.has(key)) return false;
+			seen.add(key);
+			return true;
+		});
+		const children = part.children.map((child) => walk(child, at, spun)).filter((child) => child.cubes.length > 0 || child.children.length > 0);
+		return {
+			...part,
+			cubes,
+			children
+		};
+	};
+	return {
+		...model,
+		parts: model.parts.map((part) => walk(part, [
+			0,
+			0,
+			0
+		], [
+			0,
+			0,
+			0
+		])).filter((part) => part.cubes.length > 0 || part.children.length > 0)
+	};
+}
+function countCubes(part) {
+	return part.cubes.length + part.children.reduce((total, child) => total + countCubes(child), 0);
+}
+function cubesOf(model) {
+	return model.parts.reduce((total, part) => total + countCubes(part), 0);
+}
+//#endregion
+export { mergeModels as a, dedupeCubes as i, countCubes as n, slotsOf as o, cubesOf as r, buildsOwnMesh as t };

package/dist/{model-bytecode-gWy5_uCj.js → model-bytecode-BQKCLPze.js}

@@ -1,5 +1,5 @@
 import { t as parseClassFile } from "./classfile-Bo7FUrrD.js";
-import { i as mergeModels, r as cubesOf, t as buildsOwnMesh } from "./merge-NDYxpmL8.js";
+import { a as mergeModels, r as cubesOf, t as buildsOwnMesh } from "./merge-DeHruviG.js";
 //#region src/entities/model-bytecode.ts
 /**
 * Abstract interpretation of a boxy-model builder, enough to recover the geometry.
@@ -43,6 +43,28 @@ const NUMERIC = /* @__PURE__ */ new Set([
 	"B",
 	"C"
 ]);
+/**
+* Whether a conditional jump is taken, for the opcodes that compare numbers.
+*
+* The single-operand forms (`ifeq` … `ifle`) test against zero and the two-operand forms (`if_icmpeq`
+* …) against each other, so both reduce to the sign of `left - right`.
+*/
+function compare(op, left, right) {
+	const difference = left - right;
+	switch (op) {
+		case 153:
+		case 159: return difference === 0;
+		case 154:
+		case 160: return difference !== 0;
+		case 155:
+		case 161: return difference < 0;
+		case 156:
+		case 162: return difference >= 0;
+		case 157:
+		case 163: return difference > 0;
+		default: return difference <= 0;
+	}
+}
 /** Every entity sheet is a power of two, at least 16 in each direction. A texture offset rarely is. */
 function isSheetSize(width, height) {
 	const power = (value) => value >= 16 && (value & value - 1) === 0;
@@ -109,6 +131,18 @@ const TEXTURE_HEIGHT_FIELDS = /* @__PURE__ */ new Set(["texHeight", "textureHeig
 const MAX_INLINE_DEPTH = 5;
 /** Frames per method. A model spends a handful; the cap is there so a strange jar cannot spend all day. */
 const INLINE_BUDGET = 96;
+/**
+* Instructions per extraction, shared across every frame.
+*
+* A model builder is a few hundred instructions and the longest vanilla loop runs a few thousand, so
+* this is two orders of magnitude of headroom — and it is what makes following a backward goto safe: a
+* loop whose bound cannot be worked out stops here instead of spinning.
+*/
+const STEP_BUDGET = 2e5;
+/** Elements tracked per array. A table of segment sizes is a handful; nothing here needs thousands. */
+const MAX_ARRAY = 1024;
+/** Times round a loop. Vanilla's longest builds sixteen segments, so this is generous by four times. */
+const MAX_ITERATIONS = 64;
 /** How far up a hierarchy to look for an inherited method, which is as deep as a model hierarchy goes. */
 const MAX_METHOD_HOPS = 6;
 function newShared(resolve) {
@@ -120,7 +154,10 @@ function newShared(resolve) {
 		branched: false,
 		nextHandle: 1,
 		resolve,
-		budget: INLINE_BUDGET
+		budget: INLINE_BUDGET,
+		statics: /* @__PURE__ */ new Map(),
+		initialised: /* @__PURE__ */ new Set(),
+		steps: STEP_BUDGET
 	};
 }
 /** The method a call names, looked up where the JVM would look: the owner, then up its ancestors. */
@@ -143,6 +180,8 @@ var Interpreter = class Interpreter {
 	locals = /* @__PURE__ */ new Map();
 	shared;
 	depth;
+	/** How many times each backward jump has been taken, so an undecidable loop cannot spin. */
+	loops = /* @__PURE__ */ new Map();
 	/** What this frame returned, for the caller that inlined it. */
 	returned = null;
 	constructor(shared, depth = 0) {
@@ -171,6 +210,19 @@ var Interpreter = class Interpreter {
 		}
 	}
 	/**
+	* Runs a class's `<clinit>` once, so its static tables can be read.
+	*
+	* Only for model code, and only once per class per extraction: the point is a table of numbers, and
+	* anything else a static initialiser does is of no interest here.
+	*/
+	initialise(owner) {
+		if (this.shared.initialised.has(owner) || this.depth >= MAX_INLINE_DEPTH) return;
+		this.shared.initialised.add(owner);
+		const target = findMethod(this.shared.resolve, owner, "<clinit>", "()V");
+		if (!target) return;
+		new Interpreter(this.shared, this.depth + 1).run(target.code, target.classFile);
+	}
+	/**
 	* Interprets a call into the model's own code, with the arguments it was actually given.
 	*
 	* This is what makes an inherited part come out right. `CowModel` calls `super(12, 0)` and the legs
@@ -189,6 +241,10 @@ var Interpreter = class Interpreter {
 		frame.seed(receiver, descriptor, args);
 		return frame.run(target.code, target.classFile) ? frame.returned : null;
 	}
+	/** Records a note once, since every candidate method would otherwise repeat it. */
+	note(message) {
+		if (!this.shared.notes.includes(message)) this.shared.notes.push(message);
+	}
 	pop() {
 		return this.stack.pop() ?? { kind: "unknown" };
 	}
@@ -218,6 +274,11 @@ var Interpreter = class Interpreter {
 		const first = named ? 1 : 0;
 		if (target && (named || floats >= 6 && args.length >= 6 && NUMERIC.has(args[0]) && NUMERIC.has(args[5]))) {
 			const extra = args.slice(first + 6);
+			const floatAt = extra.findIndex((arg) => arg === "F" || arg === "D");
+			const deformed = taken.find((value) => value.kind === "object" && value.handle.deformation !== void 0);
+			let inflate = target.pendingInflate;
+			if (floatAt !== -1) inflate = this.number(taken[first + 6 + floatAt]);
+			else if (deformed?.kind === "object") inflate = deformed.handle.deformation ?? 0;
 			target.cubes.push({
 				origin: [
 					numbers[first],
@@ -230,7 +291,7 @@ var Interpreter = class Interpreter {
 					numbers[first + 5]
 				],
 				uv: [...target.pendingUv],
-				inflate: extra.some((arg) => NUMERIC.has(arg)) ? this.number(taken[first + 6]) : target.pendingInflate,
+				inflate,
 				mirror: target.pendingMirror || extra.includes("Z") && this.number(taken[args.length - 1]) === 1
 			});
 			this.push(returns === "V" ? null : receiver);
@@ -348,6 +409,11 @@ var Interpreter = class Interpreter {
 			this.push(returns === "V" ? null : receiver);
 			return;
 		}
+		if (args.length === 0 && target && returns === `L${owner};`) {
+			target.pendingMirror = true;
+			this.push(receiver);
+			return;
+		}
 		if (args.length === 0 && returns.startsWith("L")) {
 			if (target) {
 				target.isRoot = true;
@@ -371,6 +437,10 @@ var Interpreter = class Interpreter {
 	run(code, constants) {
 		let at = 0;
 		while (at < code.length) {
+			if (this.shared.steps-- <= 0) {
+				this.note("ran past the step budget, so the shape is only as far as it got");
+				return false;
+			}
 			const op = code[at++];
 			switch (true) {
 				case op === 1:
@@ -443,9 +513,10 @@ var Interpreter = class Interpreter {
 					this.locals.set((op - 59) % 4, this.pop());
 					break;
 				case ARRAY_LOADS.has(op): {
-					this.pop();
+					const index = this.pop();
 					const array = this.pop();
-					this.push(array.kind === "array" ? array.items[0] ?? { kind: "unknown" } : { kind: "unknown" });
+					const at = index.kind === "number" ? index.value : 0;
+					this.push(array.kind === "array" ? array.items[at] ?? { kind: "unknown" } : { kind: "unknown" });
 					break;
 				}
 				case op >= 120 && op <= 131:
@@ -465,18 +536,19 @@ var Interpreter = class Interpreter {
 					});
 					break;
 				case op === 191: return true;
-				case op === 190:
-					this.pop();
-					this.push({
+				case op === 190: {
+					const array = this.pop();
+					this.push(array.kind === "array" ? {
 						kind: "number",
-						value: 0
-					});
+						value: array.items.length
+					} : { kind: "unknown" });
 					break;
+				}
 				case ARRAY_STORES.has(op): {
 					const value = this.pop();
-					this.pop();
+					const index = this.pop();
 					const array = this.pop();
-					if (array.kind === "array") array.items.push(value);
+					if (array.kind === "array") array.items[index.kind === "number" ? index.value : array.items.length] = value;
 					break;
 				}
 				case op === 87:
@@ -531,20 +603,36 @@ var Interpreter = class Interpreter {
 					});
 					break;
 				case op >= 133 && op <= 147: break;
-				case op === 132:
+				case op === 132: {
+					const slot = code[at];
+					const step = code[at + 1] << 24 >> 24;
 					at += 2;
+					this.locals.set(slot, {
+						kind: "number",
+						value: this.number(this.locals.get(slot) ?? { kind: "unknown" }) + step
+					});
 					break;
+				}
 				case RETURNS.has(op):
 					if (op !== 177) this.returned = this.pop();
 					return true;
-				case op === 178:
+				case op === 178: {
+					const index = code[at] << 8 | code[at + 1];
 					at += 2;
-					this.push({ kind: "unknown" });
+					const reference = constants.reference(index);
+					const key = reference ? `${reference.owner}.${reference.name}` : "";
+					if (reference && !this.shared.statics.has(key)) this.initialise(reference.owner);
+					this.push(this.shared.statics.get(key) ?? { kind: "unknown" });
 					break;
-				case op === 179:
+				}
+				case op === 179: {
+					const index = code[at] << 8 | code[at + 1];
 					at += 2;
-					this.pop();
+					const value = this.pop();
+					const reference = constants.reference(index);
+					if (reference) this.shared.statics.set(`${reference.owner}.${reference.name}`, value);
 					break;
+				}
 				case op === 180: {
 					const index = code[at] << 8 | code[at + 1];
 					at += 2;
@@ -580,6 +668,7 @@ var Interpreter = class Interpreter {
 						const taken = [];
 						for (let count = 0; count < args.length; count++) taken.unshift(this.pop());
 						const objectRef = this.pop();
+						if (objectRef.kind === "object" && args.length > 0 && args.length <= 3 && args.every((arg) => arg === "F")) objectRef.handle.deformation = Math.max(...taken.map((value) => this.number(value)));
 						if (objectRef.kind === "object" && args.length >= 2 && args.at(-1) === "I" && args.at(-2) === "I") {
 							objectRef.handle.pendingUv = [this.number(taken[args.length - 2]), this.number(taken[args.length - 1])];
 							objectRef.handle.uvFromConstructor = true;
@@ -597,22 +686,18 @@ var Interpreter = class Interpreter {
 						handle: this.handle()
 					});
 					break;
-				case op === 188:
-					at += 1;
-					this.pop();
-					this.push({
-						kind: "array",
-						items: []
-					});
-					break;
-				case op === 189:
-					at += 2;
-					this.pop();
+				case op === 188 || op === 189: {
+					at += op === 188 ? 1 : 2;
+					const length = this.pop();
+					const size = length.kind === "number" ? Math.min(Math.max(length.value, 0), MAX_ARRAY) : 0;
 					this.push({
 						kind: "array",
-						items: []
+						items: Array.from({ length: size }, () => {
+							return { kind: "unknown" };
+						})
 					});
 					break;
+				}
 				case op === 192:
 					at += 2;
 					break;
@@ -633,10 +718,20 @@ var Interpreter = class Interpreter {
 					break;
 				}
 				case op >= 153 && op <= 166: {
-					const comparisons = op >= 159 ? 2 : 1;
-					for (let count = 0; count < comparisons; count++) this.pop();
+					const twoOperands = op >= 159;
+					const right = this.pop();
+					const left = twoOperands ? this.pop() : {
+						kind: "number",
+						value: 0
+					};
+					const offset = (code[at] << 8 | code[at + 1]) << 16 >> 16;
 					at += 2;
-					this.shared.branched = true;
+					const decided = left.kind === "number" && right.kind === "number" && op <= 164 ? compare(op, twoOperands ? left.value : right.value, twoOperands ? right.value : 0) : null;
+					if (decided === null) {
+						this.shared.branched = true;
+						break;
+					}
+					if (decided) at += offset - 3;
 					break;
 				}
 				case op === 198 || op === 199:
@@ -646,12 +741,19 @@ var Interpreter = class Interpreter {
 					break;
 				case op === 167: {
 					const offset = (code[at] << 8 | code[at + 1]) << 16 >> 16;
-					if (offset <= 0) {
-						this.shared.notes.push("backward goto: the builder loops, so its geometry is not recoverable");
-						return false;
+					at += 2;
+					if (offset > 0) {
+						at += offset - 3;
+						break;
 					}
-					at += offset - 1;
-					this.shared.branched = true;
+					const site = at - 3;
+					const round = (this.loops.get(site) ?? 0) + 1;
+					this.loops.set(site, round);
+					if (round > MAX_ITERATIONS) {
+						this.note(`a loop at ${site} went round more than ${MAX_ITERATIONS} times, so the shape is only as far as it got`);
+						break;
+					}
+					at += offset - 3;
 					break;
 				}
 				case op >= 148 && op <= 152:

package/dist/{pipeline-BUIMzMzg.js → pipeline-7rvL6vx1.js}

@@ -11,7 +11,7 @@ import { n as LayeredResourceManager, t as FolderResourceManager } from "./manag
 import { n as TextureLoader } from "./loader-C18GpurU.js";
 import { t as encodeAnimatedIcon } from "./encode-LR9wxigC.js";
 import { a as builtinDynamicResources } from "./generators-BCZVlWig.js";
-import { a as spawnEggTints, i as renderEntityFallback, n as dyedVariantTint, r as renderDyedVariantFallback, t as dyeVariantName } from "./entity-fallback-Bth0fa7m.js";
+import { a as spawnEggTints, i as renderEntityFallback, n as dyedVariantTint, r as renderDyedVariantFallback, t as dyeVariantName } from "./entity-fallback-BcJWh91-.js";
 import { t as legacyTintsForChain } from "./legacy-tints-l-541wgI.js";
 import { n as defaultBlockStateModel, t as blockStateTransform } from "./blockstate-DVb8Mhxc.js";
 import path from "node:path";

package/dist/render/entity-fallback.js

@@ -1,2 +1,2 @@
-import { a as spawnEggTints, i as renderEntityFallback, n as dyedVariantTint, r as renderDyedVariantFallback, t as dyeVariantName } from "../entity-fallback-Bth0fa7m.js";
+import { a as spawnEggTints, i as renderEntityFallback, n as dyedVariantTint, r as renderDyedVariantFallback, t as dyeVariantName } from "../entity-fallback-BcJWh91-.js";
 export { dyeVariantName, dyedVariantTint, renderDyedVariantFallback, renderEntityFallback, spawnEggTints };

package/dist/render/pipeline.js

@@ -1,2 +1,2 @@
-import { t as ItemPipeline } from "../pipeline-BUIMzMzg.js";
+import { t as ItemPipeline } from "../pipeline-7rvL6vx1.js";
 export { ItemPipeline };

package/dist/resources/entity-textures.d.ts

@@ -12,6 +12,18 @@ declare const HEAD_LAYOUTS: Record<string, string>;
  * live at entity/<mob>.png or entity/<mob>/<mob>.png depending on the mod, and a
  * head only ever wants the base skin — never a blink or armour overlay.
  */
+/**
+ * Directories that hold an *overlay* rather than a mob.
+ *
+ * Matched as whole path segments rather than as tokens, because a token would take `chest_boat` out
+ * along with `chest`. A trader llama is the case that needed it: its sheet is filed as
+ * `entity/llama/decor/trader_llama`, whose leaf is exactly the mob's name — so a search by name found
+ * the carpet it wears, which is a few opaque pixels on a transparent sheet, and the llama underneath
+ * came out invisible on most of its faces.
+ */
+declare const OVERLAY_DIRECTORIES: Set<string>;
+/** Whether a texture is filed inside one of those, whatever the file itself is called. */
+declare function isOverlayPath(path: string): boolean;
 declare function findMobTexture(resources: ResourceManager, namespace: string, mob: string): Promise<ResourceLocator | null>;
 /**
  * Find the mod's own chest sheet for a chest-like item by token overlap over
@@ -48,4 +60,4 @@ declare function findFluidStill(resources: ResourceManager, namespace: string, b
  */
 declare function findFluidSibling(resources: ResourceManager, still: ResourceLocator, suffixes: string[]): Promise<ResourceLocator | null>;
 //#endregion
-export { DYE_COLORS, HEAD_LAYOUTS, coversSheet, findBedTexture, findChestTexture, findEntityTexture, findFluidSibling, findFluidStill, findMobTexture, tokens };
+export { DYE_COLORS, HEAD_LAYOUTS, OVERLAY_DIRECTORIES, coversSheet, findBedTexture, findChestTexture, findEntityTexture, findFluidSibling, findFluidStill, findMobTexture, isOverlayPath, tokens };

package/dist/resources/entity-textures.js

@@ -1,2 +1,2 @@
-import { a as findChestTexture, c as findFluidStill, i as findBedTexture, l as findMobTexture, n as HEAD_LAYOUTS, o as findEntityTexture, r as coversSheet, s as findFluidSibling, t as DYE_COLORS, u as tokens } from "../entity-textures-DFRIVdF1.js";
-export { DYE_COLORS, HEAD_LAYOUTS, coversSheet, findBedTexture, findChestTexture, findEntityTexture, findFluidSibling, findFluidStill, findMobTexture, tokens };
+import { a as findBedTexture, c as findFluidSibling, d as isOverlayPath, f as tokens, i as coversSheet, l as findFluidStill, n as HEAD_LAYOUTS, o as findChestTexture, r as OVERLAY_DIRECTORIES, s as findEntityTexture, t as DYE_COLORS, u as findMobTexture } from "../entity-textures-4XXT8jVI.js";
+export { DYE_COLORS, HEAD_LAYOUTS, OVERLAY_DIRECTORIES, coversSheet, findBedTexture, findChestTexture, findEntityTexture, findFluidSibling, findFluidStill, findMobTexture, isOverlayPath, tokens };

package/dist/{run-BQJkqc5f.js → run-BXAqZ5qY.js}

@@ -6,7 +6,7 @@ import { r as encodeRasterAsset } from "./encode-LR9wxigC.js";
 import { t as classifyItemStyle } from "./item-styles-DjYRdyHi.js";
 import { t as minifyStylesheet } from "./minify-bjMRmr5J.js";
 import { t as generateStylesheet } from "./stylesheet-CovT3B2S.js";
-import { t as ItemPipeline } from "./pipeline-BUIMzMzg.js";
+import { t as ItemPipeline } from "./pipeline-7rvL6vx1.js";
 import { t as describeResources } from "./descriptor-JyXhfd-c.js";
 import { t as WorkerRenderPool } from "./pool-CKGp1qup.js";
 import path from "node:path";

package/dist/run.js

@@ -1,3 +1,3 @@
 import { o as evaluateItemModel } from "./definition-ColsvWrH.js";
-import { t as run } from "./run-BQJkqc5f.js";
+import { t as run } from "./run-BXAqZ5qY.js";
 export { evaluateItemModel, run };

package/dist/workers/render-worker.js

@@ -1,4 +1,4 @@
-import { t as ItemPipeline } from "../pipeline-BUIMzMzg.js";
+import { t as ItemPipeline } from "../pipeline-7rvL6vx1.js";
 import { n as restoreResources } from "../descriptor-JyXhfd-c.js";
 import sharp from "sharp";
 import { parentPort, workerData } from "node:worker_threads";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nodecraft/rendermite",
-	"version": "1.6.1",
+	"version": "1.6.3",
 	"description": "Minecraft item icon renderer: renders inventory-identical item icons from vanilla and modded assets across game versions, outputting optimized PNG/WebP/AVIF plus CSS and a JSON item library.",
 	"type": "module",
 	"license": "MIT",

package/dist/merge-NDYxpmL8.js

@@ -1,48 +0,0 @@
-//#region src/entities/merge.ts
-/** A root the interpreter had to invent, because a `MeshDefinition`'s root part is anonymous. */
-const SYNTHETIC_ROOT = /^part\d+$/;
-/**
-* Where a piece's parts sit: at the top, or inside the one anonymous root a `MeshDefinition` makes.
-* Both merge into the same list of named slots and only one of them is nested.
-*/
-function slotsOf(parts) {
-	const [only] = parts;
-	if (parts.length === 1 && only.cubes.length === 0 && SYNTHETIC_ROOT.test(only.name)) return {
-		container: only,
-		slots: only.children
-	};
-	return {
-		container: null,
-		slots: parts
-	};
-}
-/** True when this piece built its own mesh rather than adding to one it was handed. */
-function buildsOwnMesh(model) {
-	return slotsOf(model.parts).container !== null;
-}
-/** `base` plus the parts of `extra` that `base` does not name. */
-function mergeModels(base, extra) {
-	const target = slotsOf(base.parts);
-	const source = slotsOf(extra.parts);
-	const named = new Set(target.slots.map((part) => part.name));
-	const missing = source.slots.filter((part) => !named.has(part.name));
-	if (missing.length === 0) return base;
-	const parts = target.container ? [{
-		...target.container,
-		children: [...target.container.children, ...missing]
-	}] : [...target.slots, ...missing];
-	const notes = [.../* @__PURE__ */ new Set([...base.notes, ...extra.notes])].filter((note) => parts.length > 1 || !note.includes("disconnected roots"));
-	return {
-		textureSize: base.textureSize[0] === 64 && base.textureSize[1] === 32 ? extra.textureSize : base.textureSize,
-		parts,
-		notes
-	};
-}
-function countCubes(part) {
-	return part.cubes.length + part.children.reduce((total, child) => total + countCubes(child), 0);
-}
-function cubesOf(model) {
-	return model.parts.reduce((total, part) => total + countCubes(part), 0);
-}
-//#endregion
-export { slotsOf as a, mergeModels as i, countCubes as n, cubesOf as r, buildsOwnMesh as t };