@nodecraft/rendermite 1.3.0 → 1.3.2

package/dist/blocks/blockstate-eval.d.ts

@@ -1,2 +1,2 @@
-import { a as BlockStateMultipartCase, c as ParseBlockStateOptions, d as matchesCondition, f as parseBlockState, i as BlockStateError, l as collectModels, n as BlockProperties, o as BlockStateVariantCase, p as weightedVariantIndex, r as BlockStateDefinition, s as MultipartCondition, t as BlockModelVariant, u as evaluateBlockState } from "../blockstate-eval-CObtPWzJ.js";
+import { a as BlockStateMultipartCase, c as ParseBlockStateOptions, d as matchesCondition, f as parseBlockState, i as BlockStateError, l as collectModels, n as BlockProperties, o as BlockStateVariantCase, p as weightedVariantIndex, r as BlockStateDefinition, s as MultipartCondition, t as BlockModelVariant, u as evaluateBlockState } from "../blockstate-eval-BzznRcVY.js";
 export { BlockModelVariant, BlockProperties, BlockStateDefinition, BlockStateError, BlockStateMultipartCase, BlockStateVariantCase, MultipartCondition, ParseBlockStateOptions, collectModels, evaluateBlockState, matchesCondition, parseBlockState, weightedVariantIndex };

package/dist/blocks/cli.js

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

package/dist/blocks/export.js

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

package/dist/blocks/pack-format.d.ts

@@ -1,2 +1,2 @@
-import { a as BlockPackElement, c as BlockPackModel, d as BlockPackSprite, f as BlockPackSpriteFrame, i as BlockPackBlockStatesFile, l as BlockPackModelsFile, n as BlockPackAtlasPage, o as BlockPackFace, p as BlockPackTintsFile, r as BlockPackBlockState, s as BlockPackMetaFile, t as BlockPackAtlasFile, u as BlockPackRenderLayer } from "../pack-format-BO2FsorN.js";
-export { BlockPackAtlasFile, BlockPackAtlasPage, BlockPackBlockState, BlockPackBlockStatesFile, BlockPackElement, BlockPackFace, BlockPackMetaFile, BlockPackModel, BlockPackModelsFile, BlockPackRenderLayer, BlockPackSprite, BlockPackSpriteFrame, BlockPackTintsFile };
+import { a as BlockPackElement, c as BlockPackModel, d as BlockPackSprite, f as BlockPackSpriteFrame, i as BlockPackBlockStatesFile, l as BlockPackModelsFile, m as BlockPackVariant, n as BlockPackAtlasPage, o as BlockPackFace, p as BlockPackTintsFile, r as BlockPackBlockState, s as BlockPackMetaFile, t as BlockPackAtlasFile, u as BlockPackRenderLayer } from "../pack-format-CfCP4kzy.js";
+export { BlockPackAtlasFile, BlockPackAtlasPage, BlockPackBlockState, BlockPackBlockStatesFile, BlockPackElement, BlockPackFace, BlockPackMetaFile, BlockPackModel, BlockPackModelsFile, BlockPackRenderLayer, BlockPackSprite, BlockPackSpriteFrame, BlockPackTintsFile, BlockPackVariant };

package/dist/{blockstate-eval-CObtPWzJ.d.ts → blockstate-eval-BzznRcVY.d.ts}

@@ -32,11 +32,19 @@ interface BlockModelVariant {
   /** Relative weight within its list; the game picks one per block position. */
   weight: number;
 }
-/** One entry of a `variants` map, with its `a=b,c=d` key already parsed. */
-interface BlockStateVariantCase {
+/**
+ * One entry of a `variants` map, with its `a=b,c=d` key already parsed.
+ *
+ * Generic over the variant because the evaluation reads only `model`: a pack
+ * consumer holds variants whose rotations are optional (the emit omits them at
+ * their defaults) and can evaluate those directly, getting its own shape back.
+ */
+interface BlockStateVariantCase<Variant extends {
+  model: string;
+} = BlockModelVariant> {
   /** Properties this case constrains; unstated ones are wildcards. */
   when: Record<string, string>;
-  apply: BlockModelVariant[];
+  apply: Variant[];
 }
 /**
  * A `multipart` predicate. `match` holds one or more accepted values per
@@ -52,17 +60,21 @@ type MultipartCondition = {
   op: 'or';
   terms: MultipartCondition[];
 };
-interface BlockStateMultipartCase {
+interface BlockStateMultipartCase<Variant extends {
+  model: string;
+} = BlockModelVariant> {
   /** null for an unconditional part, which always applies. */
   when: MultipartCondition | null;
-  apply: BlockModelVariant[];
+  apply: Variant[];
 }
-type BlockStateDefinition = {
+type BlockStateDefinition<Variant extends {
+  model: string;
+} = BlockModelVariant> = {
   kind: 'variants';
-  cases: BlockStateVariantCase[];
+  cases: Array<BlockStateVariantCase<Variant>>;
 } | {
   kind: 'multipart';
-  cases: BlockStateMultipartCase[];
+  cases: Array<BlockStateMultipartCase<Variant>>;
 };
 declare class BlockStateError extends Error {}
 interface ParseBlockStateOptions {
@@ -104,7 +116,9 @@ declare function matchesCondition(condition: MultipartCondition, properties: Blo
  * Still empty when even that finds nothing, which is a real answer: a blockstate
  * that covers only some of a block's states draws nothing for the rest.
  */
-declare function evaluateBlockState(definition: BlockStateDefinition, properties: BlockProperties): BlockModelVariant[][];
+declare function evaluateBlockState<Variant extends {
+  model: string;
+}>(definition: BlockStateDefinition<Variant>, properties: BlockProperties): Variant[][];
 /** Every model a blockstate can name, for deciding what to export. */
 declare function collectModels(definition: BlockStateDefinition): string[];
 /**

package/dist/{cli-CWUKXFbx.js → cli-Dq4CFSPi.js}

@@ -1,6 +1,6 @@
 import { n as builtinPackPath } from "./builtin-WkWjATeh.js";
 import { n as LayeredResourceManager, t as FolderResourceManager } from "./manager-CYbAkWuT.js";
-import { t as exportBlockPack } from "./export-DY5sGwt0.js";
+import { t as exportBlockPack } from "./export-B9lH7Tek.js";
 import { n as prepareModResources } from "./prepare-B8oPdGYz.js";
 import { t as downloadClientJar } from "./download-1wAfrGKx.js";
 import { a as prepareVersionResources, r as compareVersions } from "./prepare-C95vjt_o.js";

package/dist/cli.js

@@ -6,7 +6,7 @@ import { n as harvestTintOverrides, t as curatedTintOverrides } from "./tints-nx
 import { t as JarResourceManager } from "./jar-5aLDI0nT.js";
 import { t as downloadClientJar } from "./download-1wAfrGKx.js";
 import { a as prepareVersionResources, i as eraForVersion, n as GEOMETRY_DONOR_VERSIONS } from "./prepare-C95vjt_o.js";
-import { t as runBlocksCli } from "./cli-CWUKXFbx.js";
+import { t as runBlocksCli } from "./cli-Dq4CFSPi.js";
 import { t as run } from "./run-Diql5y56.js";
 import path from "node:path";
 import os from "node:os";

package/dist/{export-DY5sGwt0.js → export-B9lH7Tek.js}

@@ -191,26 +191,35 @@ function translateElements(elements, offset) {
 	});
 }
 function serializeBlockState(definition, exported) {
-	const cases = [];
-	for (const entry of definition.cases) {
-		const apply = entry.apply.filter((variant) => exported(variant.model));
-		if (apply.length === 0) continue;
-		cases.push({
-			when: entry.when,
-			apply: apply.map((variant) => {
-				return {
-					model: variant.model,
-					...variant.x !== 0 && { x: variant.x },
-					...variant.y !== 0 && { y: variant.y },
-					...variant.z !== 0 && { z: variant.z },
-					...variant.uvlock && { uvlock: true },
-					...variant.weight !== 1 && { weight: variant.weight }
-				};
-			})
+	/** Every default dropped, since most variants state none of these. */
+	const serializeApply = (apply) => apply.filter((variant) => exported(variant.model)).map((variant) => {
+		return {
+			model: variant.model,
+			...variant.x !== 0 && { x: variant.x },
+			...variant.y !== 0 && { y: variant.y },
+			...variant.z !== 0 && { z: variant.z },
+			...variant.uvlock && { uvlock: true },
+			...variant.weight !== 1 && { weight: variant.weight }
+		};
+	});
+	if (definition.kind === "variants") {
+		const cases = definition.cases.flatMap((entry) => {
+			const apply = serializeApply(entry.apply);
+			return apply.length === 0 ? [] : [{
+				when: entry.when,
+				apply
+			}];
 		});
+		return cases.length === 0 ? null : { variants: cases };
 	}
-	if (cases.length === 0) return null;
-	return definition.kind === "variants" ? { variants: cases } : { multipart: cases };
+	const cases = definition.cases.flatMap((entry) => {
+		const apply = serializeApply(entry.apply);
+		return apply.length === 0 ? [] : [{
+			when: entry.when,
+			apply
+		}];
+	});
+	return cases.length === 0 ? null : { multipart: cases };
 }
 /**
 * Any texture the model binds, for a model that declares no `particle`. Ordered
@@ -549,10 +558,24 @@ async function exportBlockPack(options) {
 			return model === void 0 || model.elements.length === 0 && !model.mesh?.length;
 		});
 		if (empty.length === 0) continue;
+		const definition = definitions.get(id);
+		if (definition?.kind === "multipart") {
+			const drawable = definition.cases.filter((part) => part.apply.some((variant) => !empty.includes(variant.model)));
+			if (drawable.length > 0) {
+				definition.cases = drawable;
+				blockModels.set(id, references.filter((reference) => !empty.includes(reference)));
+				failures.push({
+					id,
+					kind: "geometry",
+					reason: `the game draws ${empty.join(", ")} in code; the pack drops those parts and keeps the ${drawable.length} that do draw, since a multipart part laid over them would draw as well as them rather than instead`
+				});
+				continue;
+			}
+		}
 		const substitute = await itemModelSubstitute(id, resources, models);
 		if (substitute === null) continue;
 		const stood = adoptSubstitute(substitute);
-		for (const part of definitions.get(id)?.cases ?? []) for (const variant of part.apply) if (empty.includes(variant.model)) variant.model = stood;
+		for (const part of definition?.cases ?? []) for (const variant of part.apply) if (empty.includes(variant.model)) variant.model = stood;
 		blockModels.set(id, [...references.filter((reference) => !empty.includes(reference)), stood]);
 		const drawnInCode = empty.length === references.length ? "this block" : empty.join(", ");
 		failures.push({

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { a as TextureMeta, i as TextureLoader, o as TextureResolutionError, r as
 import { d as parseAtlasSources, n as AtlasSource, r as AtlasSourceError, s as ResolvedSprite, t as AtlasResolver, u as createAtlasResolver } from "./sources-B9X9w3qP.js";
 import { a as PackedRect, i as PackedPage, n as PackOptions, o as packAtlas, r as PackedAtlas, t as PackEntry } from "./atlas-pack-DRTrWcSU.js";
 import { a as resolveTexture, n as ModelResolutionError, o as salvageJson, r as ResolvedModel, t as ModelLoader } from "./loader-C_1_amsq.js";
-import { a as BlockStateMultipartCase, d as matchesCondition, f as parseBlockState, i as BlockStateError, l as collectModels, n as BlockProperties, o as BlockStateVariantCase, p as weightedVariantIndex, r as BlockStateDefinition, s as MultipartCondition, t as BlockModelVariant, u as evaluateBlockState } from "./blockstate-eval-CObtPWzJ.js";
+import { a as BlockStateMultipartCase, d as matchesCondition, f as parseBlockState, i as BlockStateError, l as collectModels, n as BlockProperties, o as BlockStateVariantCase, p as weightedVariantIndex, r as BlockStateDefinition, s as MultipartCondition, t as BlockModelVariant, u as evaluateBlockState } from "./blockstate-eval-BzznRcVY.js";
 import { i as exportBlockPack, n as BlockPackResult, r as ExportBlockPackOptions, t as BlockPackFailure } from "./export-BIpqNU3H.js";
 import { i as buildObjMesh, n as ObjMesh, r as ObjMeshError, t as MeshGroup } from "./obj-mesh-C6Sp4Ysc.js";
 import { i as buildBlockTints, n as BlockTintPack, t as BlockTint } from "./tints-2k3ZhkY3.js";

package/dist/index.js

@@ -10,7 +10,7 @@ import { t as buildBlockTints } from "./tints-a9FWZLma.js";
 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-CYbAkWuT.js";
 import { n as TextureLoader, r as TextureResolutionError, t as AnimatedTexture } from "./loader-C18GpurU.js";
-import { t as exportBlockPack } from "./export-DY5sGwt0.js";
+import { t as exportBlockPack } from "./export-B9lH7Tek.js";
 import { a as defaultProperties, i as UNKNOWN_MODEL, n as InvalidItemDefinitionError, o as evaluateItemModel } from "./definition-ColsvWrH.js";
 import { n as UnsafeJarError, r as isUnsafeEntryPath, t as JarResourceManager } from "./jar-5aLDI0nT.js";
 import { n as prepareModResources } from "./prepare-B8oPdGYz.js";

package/dist/{pack-format-BO2FsorN.d.ts → pack-format-CfCP4kzy.d.ts}

@@ -1,5 +1,5 @@
 import { a as FaceDirectionName, l as Vec3, o as ModelElementJson, u as Vec4 } from "./types-qlp3I8_-.js";
-import { r as BlockStateDefinition } from "./blockstate-eval-CObtPWzJ.js";
+import { a as BlockStateMultipartCase, o as BlockStateVariantCase } from "./blockstate-eval-BzznRcVY.js";
 import { t as MeshGroup } from "./obj-mesh-C6Sp4Ysc.js";
 import { n as BlockTintPack } from "./tints-2k3ZhkY3.js";
 //#region src/blocks/pack-format.d.ts
@@ -86,18 +86,28 @@ type BlockPackModelsFile = Record<string, BlockPackModel>;
 /** `blockstates.json`, by block id, with keys and predicates already parsed. */
 type BlockPackBlockStatesFile = Record<string, BlockPackBlockState>;
 /**
- * One block's cases as the pack writes them: the tagged union `evaluateBlockState`
- * takes, flattened to the key the file uses.
+ * A variant as the pack writes it. Every rotation is optional because the emit
+ * drops each one at its default, which is most of them.
+ */
+interface BlockPackVariant {
+  model: string;
+  x?: number;
+  y?: number;
+  z?: number;
+  uvlock?: true;
+  weight?: number;
+}
+/**
+ * One block's cases as the pack writes them: what `evaluateBlockState` takes,
+ * flattened to the key the file uses. Pass it as
+ * `{ kind: 'variants', cases: state.variants }` and the models come back as
+ * `BlockPackVariant`, no cast in either direction.
  */
 type BlockPackBlockState = {
-  variants: Extract<BlockStateDefinition, {
-    kind: 'variants';
-  }>['cases'];
+  variants: Array<BlockStateVariantCase<BlockPackVariant>>;
   multipart?: undefined;
 } | {
-  multipart: Extract<BlockStateDefinition, {
-    kind: 'multipart';
-  }>['cases'];
+  multipart: Array<BlockStateMultipartCase<BlockPackVariant>>;
   variants?: undefined;
 };
 /** `tints.json`. */
@@ -118,4 +128,4 @@ interface BlockPackMetaFile {
   hashes: Record<string, string>;
 }
 //#endregion
-export { BlockPackElement as a, BlockPackModel as c, BlockPackSprite as d, BlockPackSpriteFrame as f, BlockPackBlockStatesFile as i, BlockPackModelsFile as l, BlockPackAtlasPage as n, BlockPackFace as o, BlockPackTintsFile as p, BlockPackBlockState as r, BlockPackMetaFile as s, BlockPackAtlasFile as t, BlockPackRenderLayer as u };
+export { BlockPackElement as a, BlockPackModel as c, BlockPackSprite as d, BlockPackSpriteFrame as f, BlockPackBlockStatesFile as i, BlockPackModelsFile as l, BlockPackVariant as m, BlockPackAtlasPage as n, BlockPackFace as o, BlockPackTintsFile as p, BlockPackBlockState as r, BlockPackMetaFile as s, BlockPackAtlasFile as t, BlockPackRenderLayer as u };

package/dist/pack.d.ts

@@ -1,5 +1,5 @@
-import { a as BlockStateMultipartCase, d as matchesCondition, n as BlockProperties, o as BlockStateVariantCase, p as weightedVariantIndex, r as BlockStateDefinition, s as MultipartCondition, t as BlockModelVariant, u as evaluateBlockState } from "./blockstate-eval-CObtPWzJ.js";
+import { a as BlockStateMultipartCase, d as matchesCondition, n as BlockProperties, o as BlockStateVariantCase, p as weightedVariantIndex, r as BlockStateDefinition, s as MultipartCondition, t as BlockModelVariant, u as evaluateBlockState } from "./blockstate-eval-BzznRcVY.js";
 import { n as ObjMesh, t as MeshGroup } from "./obj-mesh-C6Sp4Ysc.js";
 import { n as BlockTintPack, t as BlockTint } from "./tints-2k3ZhkY3.js";
-import { a as BlockPackElement, c as BlockPackModel, d as BlockPackSprite, f as BlockPackSpriteFrame, i as BlockPackBlockStatesFile, l as BlockPackModelsFile, n as BlockPackAtlasPage, o as BlockPackFace, p as BlockPackTintsFile, r as BlockPackBlockState, s as BlockPackMetaFile, t as BlockPackAtlasFile, u as BlockPackRenderLayer } from "./pack-format-BO2FsorN.js";
-export { type BlockModelVariant, type BlockPackAtlasFile, type BlockPackAtlasPage, type BlockPackBlockState, type BlockPackBlockStatesFile, type BlockPackElement, type BlockPackFace, type BlockPackMetaFile, type BlockPackModel, type BlockPackModelsFile, type BlockPackRenderLayer, type BlockPackSprite, type BlockPackSpriteFrame, type BlockPackTintsFile, type BlockProperties, type BlockStateDefinition, type BlockStateMultipartCase, type BlockStateVariantCase, type BlockTint, type BlockTintPack, type MeshGroup, type MultipartCondition, type ObjMesh, evaluateBlockState, matchesCondition, weightedVariantIndex };
+import { a as BlockPackElement, c as BlockPackModel, d as BlockPackSprite, f as BlockPackSpriteFrame, i as BlockPackBlockStatesFile, l as BlockPackModelsFile, m as BlockPackVariant, n as BlockPackAtlasPage, o as BlockPackFace, p as BlockPackTintsFile, r as BlockPackBlockState, s as BlockPackMetaFile, t as BlockPackAtlasFile, u as BlockPackRenderLayer } from "./pack-format-CfCP4kzy.js";
+export { type BlockModelVariant, type BlockPackAtlasFile, type BlockPackAtlasPage, type BlockPackBlockState, type BlockPackBlockStatesFile, type BlockPackElement, type BlockPackFace, type BlockPackMetaFile, type BlockPackModel, type BlockPackModelsFile, type BlockPackRenderLayer, type BlockPackSprite, type BlockPackSpriteFrame, type BlockPackTintsFile, type BlockPackVariant, type BlockProperties, type BlockStateDefinition, type BlockStateMultipartCase, type BlockStateVariantCase, type BlockTint, type BlockTintPack, type MeshGroup, type MultipartCondition, type ObjMesh, evaluateBlockState, matchesCondition, weightedVariantIndex };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nodecraft/rendermite",
-	"version": "1.3.0",
+	"version": "1.3.2",
 	"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",