minerender 2.1.0-alpha.140 → 2.1.0-alpha.141

package/dist/node/index.mjs

@@ -309,6 +309,9 @@ var init_Caching = __esm({
       static {
         this.blockEntityIndexCache = _Caching.createAssetCache();
       }
+      static {
+        this.entityDatasetVersionCache = _Caching.createAssetCache();
+      }
       static {
         this.unihexCache = _Caching.createAssetCache();
       }
@@ -353,6 +356,7 @@ var init_Caching = __esm({
           this.entityTextureCache,
           this.entityAnimationCache,
           this.blockEntityIndexCache,
+          this.entityDatasetVersionCache,
           this.fontCache,
           this.unihexCache,
           this.bannerPatternCache,
@@ -3331,23 +3335,39 @@ var init_MinecraftCubeTexture = __esm({
   }
 });
 
+// src/assets/_versions/DatasetVersions.ts
+var parseRelease, compare2, nearestRelease;
+var init_DatasetVersions = __esm({
+  "src/assets/_versions/DatasetVersions.ts"() {
+    parseRelease = (value) => /^\d+\.\d+(?:\.\d+)?$/.test(value) ? value.split(".").map(Number) : void 0;
+    compare2 = (left, right) => {
+      for (let i = 0; i < 3; i++) {
+        const difference = (left[i] ?? 0) - (right[i] ?? 0);
+        if (difference) return difference;
+      }
+      return 0;
+    };
+    nearestRelease = (requestedVersion, published) => {
+      const requested = parseRelease(requestedVersion);
+      if (!requested) return void 0;
+      const versions = published.map((name) => ({ name, number: parseRelease(name) })).filter((entry) => !!entry.number).sort((left, right) => compare2(left.number, right.number));
+      const sameLine = versions.filter((entry) => entry.number[0] === requested[0] && entry.number[1] === requested[1]);
+      const selected = sameLine.sort((left, right) => Math.abs((left.number[2] ?? 0) - (requested[2] ?? 0)) - Math.abs((right.number[2] ?? 0) - (requested[2] ?? 0)) || compare2(left.number, right.number))[0] ?? versions.filter((entry) => compare2(entry.number, requested) <= 0).pop() ?? versions[0];
+      return selected?.name;
+    };
+  }
+});
+
 // src/assets/MineRenderData.ts
-var object2, release, compare2, MineRenderData;
+var object2, MineRenderData;
 var init_MineRenderData = __esm({
   "src/assets/MineRenderData.ts"() {
+    init_DatasetVersions();
     init_AssetKey();
     init_AssetLoader();
     init_AssetParsers();
     init_Caching();
     object2 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
-    release = (value) => /^\d+\.\d+(?:\.\d+)?$/.test(value) ? value.split(".").map(Number) : void 0;
-    compare2 = (left, right) => {
-      for (let i = 0; i < 3; i++) {
-        const difference = (left[i] ?? 0) - (right[i] ?? 0);
-        if (difference) return difference;
-      }
-      return 0;
-    };
     MineRenderData = class {
       /** Loads one registry. Missing files and invalid data reject the request. */
       static async get(dataset, root) {
@@ -3377,9 +3397,9 @@ var init_MineRenderData = __esm({
         const scope = AssetLoader.persistentScope;
         return this.cached(`resolve:${requestRoot === void 0 ? "sources" : "explicit"}:${root}`, scope, defaultRoot, async () => {
           const requestedVersion = root.slice(root.lastIndexOf("/") + 1);
-          let manifest = await this.manifest(root, requestRoot !== void 0 && release(requestedVersion) ? requestedVersion : void 0, requestRoot);
+          let manifest = await this.manifest(root, requestRoot !== void 0 && parseRelease(requestedVersion) ? requestedVersion : void 0, requestRoot);
           if (manifest) return { requestedVersion, version: manifest.minecraftVersion, root, manifest };
-          const requested = release(requestedVersion);
+          const requested = parseRelease(requestedVersion);
           if (!requested) {
             throw new Error(`No MineRender data is published for ${requestedVersion}; automatic fallback requires a release`);
           }
@@ -3391,14 +3411,12 @@ var init_MineRenderData = __esm({
             }
             return value.versions;
           });
-          const versions = index.map((entry) => ({ name: entry.name, number: release(entry.name) })).filter((entry) => !!entry.number).sort((left, right) => compare2(left.number, right.number));
-          const sameLine = versions.filter((entry) => entry.number[0] === requested[0] && entry.number[1] === requested[1]);
-          const selected = sameLine.sort((left, right) => Math.abs((left.number[2] ?? 0) - (requested[2] ?? 0)) - Math.abs((right.number[2] ?? 0) - (requested[2] ?? 0)) || compare2(left.number, right.number))[0] ?? versions.filter((entry) => compare2(entry.number, requested) <= 0).pop() ?? versions[0];
+          const selected = nearestRelease(requestedVersion, index.map((entry) => entry.name));
           if (!selected) throw new Error(`No compatible MineRender data is published for ${requestedVersion}`);
-          const resolvedRoot = `${base}/${selected.name}`;
-          manifest = await this.manifest(resolvedRoot, selected.name, resolvedRoot);
-          if (!manifest) throw new Error(`Missing MineRender manifest for published version ${selected.name}`);
-          return { requestedVersion, version: selected.name, root: resolvedRoot, manifest };
+          const resolvedRoot = `${base}/${selected}`;
+          manifest = await this.manifest(resolvedRoot, selected, resolvedRoot);
+          if (!manifest) throw new Error(`Missing MineRender manifest for published version ${selected}`);
+          return { requestedVersion, version: selected, root: resolvedRoot, manifest };
         });
       }
       static async manifest(root, expectedVersion, requestRoot) {
@@ -4520,118 +4538,12 @@ var init_Biomes = __esm({
   }
 });
 
-// src/assets/BlockEntities.ts
-import { Matrix4 as Matrix42 } from "three";
-var log9, BlockEntities;
-var init_BlockEntities = __esm({
-  "src/assets/BlockEntities.ts"() {
-    init_AssetKey();
-    init_AssetLoader();
-    init_source();
-    init_Caching();
-    init_log();
-    log9 = logger("BlockEntities");
-    BlockEntities = class {
-      /**
-       * Loads the block index of a version. Versions and sources without one yield an empty index, and so does
-       * a failed load: the index is optional, and blocks must not retry or fail with it one by one. The empty
-       * result is cached like any other; `Caching.clear()` or `AssetLoader.setVersion()` forces a new attempt.
-       */
-      static async getIndex(root) {
-        const key = new AssetKey("entity-models", "blocks", void 0, void 0, void 0, ".json", root);
-        key.rootType = void 0;
-        const index = await Caching.blockEntityIndexCache.get(key.serialize(), async () => {
-          try {
-            return await AssetLoader.get(key, "json" /* JSON */) ?? {};
-          } catch (error) {
-            log9.warn("Could not load the block entity index; block entities are drawn as plain block models", error);
-            return {};
-          }
-        });
-        return index ?? {};
-      }
-      /** The index entry of a block ID such as `minecraft:chest`. */
-      static entry(index, block) {
-        const entry = Object.prototype.hasOwnProperty.call(index, block) ? index[block] : void 0;
-        return Array.isArray(entry?.parts) ? entry : void 0;
-      }
-      /** Selects the parts and placement for a block ID such as `minecraft:chest`; undefined when nothing is drawn. */
-      static resolve(index, block, state = {}) {
-        const entry = this.entry(index, block);
-        if (!entry) return void 0;
-        const value = (property) => String(state[property]).toLowerCase();
-        const parts = entry.parts.filter((part) => Object.entries(part.when ?? {}).every(([property, values]) => String(values).split("|").includes(value(property))));
-        if (!parts.length) return void 0;
-        let rotation = 0;
-        if (entry.rotation) {
-          const selected = value(entry.rotation.property);
-          rotation = "degrees" in entry.rotation ? entry.rotation.degrees[selected] : Number(selected) * entry.rotation.step;
-          if (!Number.isFinite(rotation)) rotation = 0;
-        }
-        return { parts, rotation, translation: entry.translation ?? [0, 0, 0] };
-      }
-      /** Placement in block space (0..16 per axis), applied on top of the model's own transform. */
-      static matrix(resolved, matrix = new Matrix42()) {
-        return matrix.makeTranslation(8, 0, 8).multiply(new Matrix42().makeRotationY(resolved.rotation * Math.PI / 180)).multiply(new Matrix42().makeTranslation(resolved.translation[0] - 8, resolved.translation[1], resolved.translation[2] - 8));
-      }
-    };
-  }
-});
-
-// src/assets/DecoratedPots.ts
-var POTTERY_SHERDS, DecoratedPots;
-var init_DecoratedPots = __esm({
-  "src/assets/DecoratedPots.ts"() {
-    init_AssetKey();
-    POTTERY_SHERDS = Object.freeze([
-      "angler",
-      "archer",
-      "arms_up",
-      "blade",
-      "brewer",
-      "burn",
-      "danger",
-      "explorer",
-      "flow",
-      "friend",
-      "guster",
-      "heart",
-      "heartbreak",
-      "howl",
-      "miner",
-      "mourner",
-      "plenty",
-      "prize",
-      "scrape",
-      "sheaf",
-      "shelter",
-      "skull",
-      "snort"
-    ].map((pattern2) => `minecraft:${pattern2}_pottery_sherd`));
-    DecoratedPots = class {
-      /** Reads up to four item IDs in back, left, right, front order; missing and unmapped items use plain sides. */
-      static getSideTextures(value, root) {
-        const items = value === void 0 ? [] : value;
-        if (!Array.isArray(items) || items.length > 4) throw new Error("pot_decorations must be an array of at most four item IDs");
-        const textures = items.map((item) => {
-          if (!isResourceLocation(item)) throw new Error("Pot decorations must be item identifiers");
-          const id = item.includes(":") ? item : `minecraft:${item}`;
-          return POTTERY_SHERDS.includes(id) ? id.slice("minecraft:".length).replace(/_sherd$/, "_pattern") : "decorated_pot_side";
-        });
-        return Object.fromEntries(["back", "left", "right", "front"].map((side, index) => [
-          side,
-          new AssetKey("minecraft", `decorated_pot/${textures[index] ?? "decorated_pot_side"}`, "textures", "entity", "assets", ".png", root)
-        ]));
-      }
-    };
-  }
-});
-
 // src/assets/Entities.ts
 var Entities;
 var init_Entities = __esm({
   "src/assets/Entities.ts"() {
     init_AssetKey();
+    init_DatasetVersions();
     init_AssetLoader();
     init_source();
     init_Caching();
@@ -4639,11 +4551,36 @@ var init_Entities = __esm({
     init_MineRenderError();
     init_ModelTextures();
     Entities = class {
+      /**
+       * Resolves `root` (default: the active version). Uses the exact dataset when published or when the
+       * version is not a release; otherwise selects the nearest published release, like {@link MineRenderData.resolve}.
+       * Textures keep the requested root.
+       */
+      static async getDatasetRoot(root) {
+        const requestRoot = (root ?? AssetLoader.ROOT).replace(/\/+$/, "");
+        const requestedVersion = requestRoot.slice(requestRoot.lastIndexOf("/") + 1);
+        const base = requestRoot.slice(0, requestRoot.lastIndexOf("/"));
+        const selected = await Caching.entityDatasetVersionCache.get(root ?? `sources:${AssetLoader.ROOT}`, async () => {
+          const key = new AssetKey("entity-models", "version", void 0, void 0, void 0, ".json", root);
+          key.rootType = void 0;
+          if (!parseRelease(requestedVersion) || await AssetLoader.get(key, "json" /* JSON */) !== void 0) return requestedVersion;
+          const indexKey = new AssetKey("entity-models", "versions", void 0, void 0, void 0, ".json", base);
+          indexKey.rootType = void 0;
+          const index = await AssetLoader.get(indexKey, "json" /* JSON */);
+          if (index === void 0) return requestedVersion;
+          if (!index || typeof index !== "object" || Array.isArray(index) || !Array.isArray(index.versions) || !index.versions.every((entry) => entry && typeof entry === "object" && !Array.isArray(entry) && typeof entry.name === "string")) {
+            throw new MineRenderError(`Invalid entity model version index at ${base}/entity-models/versions.json`);
+          }
+          return nearestRelease(requestedVersion, index.versions.map((entry) => entry.name)) ?? requestedVersion;
+        });
+        return selected === requestedVersion ? root : `${base}/${selected}`;
+      }
       /** Lists model paths in the `minecraft` namespace, including subdirectories and excluding `.json`. */
       static async getEntityList() {
+        const root = await this.getDatasetRoot();
         const collect = async (path) => {
           const prefix2 = path ? `${path}/` : "";
-          const key = new AssetKey(DEFAULT_NAMESPACE, `${prefix2}_list`, void 0, void 0, "entity-models", ".json");
+          const key = new AssetKey(DEFAULT_NAMESPACE, `${prefix2}_list`, void 0, void 0, "entity-models", ".json", root);
           const list2 = await Caching.listAssetCache.get(key.serialize(), () => AssetLoader.get(key, "list" /* LIST */));
           if (!list2) return [];
           const files = list2.files.filter((file) => file.endsWith(".json") && file !== "_list.json").map((file) => `${prefix2}${file.slice(0, -5)}`);
@@ -4654,7 +4591,7 @@ var init_Entities = __esm({
       }
       static async getModelFile(modelKey) {
         const path = isAssetKey(modelKey) ? modelKey.getFullPath() : modelKey.path;
-        const key = new AssetKey(modelKey.namespace, path, void 0, void 0, "entity-models", ".json", isAssetKey(modelKey) ? modelKey.root : void 0);
+        const key = new AssetKey(modelKey.namespace, path, void 0, void 0, "entity-models", ".json", await this.getDatasetRoot(isAssetKey(modelKey) ? modelKey.root : void 0));
         return Caching.entityModelCache.get(key.serialize(), () => AssetLoader.get(key, "json" /* JSON */));
       }
       /** Returns selectable geometry-layer names, or an empty list when the model is missing. */
@@ -4715,7 +4652,7 @@ var init_Entities = __esm({
        */
       static async getAnimations(modelKey) {
         const path = isAssetKey(modelKey) ? modelKey.getFullPath() : modelKey.path;
-        const key = new AssetKey(modelKey.namespace, path, void 0, void 0, "entity-models/animations", ".json", isAssetKey(modelKey) ? modelKey.root : void 0);
+        const key = new AssetKey(modelKey.namespace, path, void 0, void 0, "entity-models/animations", ".json", await this.getDatasetRoot(isAssetKey(modelKey) ? modelKey.root : void 0));
         const file = await Caching.entityAnimationCache.get(key.serialize(), () => AssetLoader.get(key, "json" /* JSON */));
         return file?.animations;
       }
@@ -4757,6 +4694,115 @@ var init_Entities = __esm({
   }
 });
 
+// src/assets/BlockEntities.ts
+import { Matrix4 as Matrix42 } from "three";
+var log9, BlockEntities;
+var init_BlockEntities = __esm({
+  "src/assets/BlockEntities.ts"() {
+    init_AssetKey();
+    init_Entities();
+    init_AssetLoader();
+    init_source();
+    init_Caching();
+    init_log();
+    log9 = logger("BlockEntities");
+    BlockEntities = class {
+      /**
+       * Loads the block index of a version. Versions and sources without one yield an empty index, and so does
+       * a failed load: the index is optional, and blocks must not retry or fail with it one by one. The empty
+       * result is cached like any other; `Caching.clear()` or `AssetLoader.setVersion()` forces a new attempt.
+       */
+      static async getIndex(root) {
+        const key = new AssetKey("entity-models", "blocks", void 0, void 0, void 0, ".json", root);
+        key.rootType = void 0;
+        const index = await Caching.blockEntityIndexCache.get(key.serialize(), async () => {
+          try {
+            key.root = await Entities.getDatasetRoot(root);
+            return await AssetLoader.get(key, "json" /* JSON */) ?? {};
+          } catch (error) {
+            log9.warn("Could not load the block entity index; block entities are drawn as plain block models", error);
+            return {};
+          }
+        });
+        return index ?? {};
+      }
+      /** The index entry of a block ID such as `minecraft:chest`. */
+      static entry(index, block) {
+        const entry = Object.prototype.hasOwnProperty.call(index, block) ? index[block] : void 0;
+        return Array.isArray(entry?.parts) ? entry : void 0;
+      }
+      /** Selects the parts and placement for a block ID such as `minecraft:chest`; undefined when nothing is drawn. */
+      static resolve(index, block, state = {}) {
+        const entry = this.entry(index, block);
+        if (!entry) return void 0;
+        const value = (property) => String(state[property]).toLowerCase();
+        const parts = entry.parts.filter((part) => Object.entries(part.when ?? {}).every(([property, values]) => String(values).split("|").includes(value(property))));
+        if (!parts.length) return void 0;
+        let rotation = 0;
+        if (entry.rotation) {
+          const selected = value(entry.rotation.property);
+          rotation = "degrees" in entry.rotation ? entry.rotation.degrees[selected] : Number(selected) * entry.rotation.step;
+          if (!Number.isFinite(rotation)) rotation = 0;
+        }
+        return { parts, rotation, translation: entry.translation ?? [0, 0, 0] };
+      }
+      /** Placement in block space (0..16 per axis), applied on top of the model's own transform. */
+      static matrix(resolved, matrix = new Matrix42()) {
+        return matrix.makeTranslation(8, 0, 8).multiply(new Matrix42().makeRotationY(resolved.rotation * Math.PI / 180)).multiply(new Matrix42().makeTranslation(resolved.translation[0] - 8, resolved.translation[1], resolved.translation[2] - 8));
+      }
+    };
+  }
+});
+
+// src/assets/DecoratedPots.ts
+var POTTERY_SHERDS, DecoratedPots;
+var init_DecoratedPots = __esm({
+  "src/assets/DecoratedPots.ts"() {
+    init_AssetKey();
+    POTTERY_SHERDS = Object.freeze([
+      "angler",
+      "archer",
+      "arms_up",
+      "blade",
+      "brewer",
+      "burn",
+      "danger",
+      "explorer",
+      "flow",
+      "friend",
+      "guster",
+      "heart",
+      "heartbreak",
+      "howl",
+      "miner",
+      "mourner",
+      "plenty",
+      "prize",
+      "scrape",
+      "sheaf",
+      "shelter",
+      "skull",
+      "snort"
+    ].map((pattern2) => `minecraft:${pattern2}_pottery_sherd`));
+    DecoratedPots = class {
+      /** Reads up to four item IDs in back, left, right, front order; missing and unmapped items use plain sides. */
+      static getSideTextures(value, root) {
+        const items = value === void 0 ? [] : value;
+        if (!Array.isArray(items) || items.length > 4) throw new Error("pot_decorations must be an array of at most four item IDs");
+        const textures = items.map((item) => {
+          if (!isResourceLocation(item)) throw new Error("Pot decorations must be item identifiers");
+          const id = item.includes(":") ? item : `minecraft:${item}`;
+          return POTTERY_SHERDS.includes(id) ? id.slice("minecraft:".length).replace(/_sherd$/, "_pattern") : "decorated_pot_side";
+        });
+        return Object.fromEntries(["back", "left", "right", "front"].map((side, index) => [
+          side,
+          new AssetKey("minecraft", `decorated_pot/${textures[index] ?? "decorated_pot_side"}`, "textures", "entity", "assets", ".png", root)
+        ]));
+      }
+    };
+  }
+});
+
 // src/assets/_fonts/Unihex.ts
 var Unihex_exports = {};
 __export(Unihex_exports, {
@@ -17835,7 +17881,7 @@ var AnvilWorldSource = class {
     read.waiters++;
     return new Promise((resolve, reject) => {
       let finished = false;
-      const release2 = () => {
+      const release = () => {
         if (finished) return false;
         finished = true;
         signal?.removeEventListener("abort", abort);
@@ -17843,7 +17889,7 @@ var AnvilWorldSource = class {
         return true;
       };
       const abort = () => {
-        if (!release2()) return;
+        if (!release()) return;
         if (!read.waiters && !read.settled) {
           if (this.pending.get(key) === read) this.pending.delete(key);
           read.controller.abort(signal.reason);
@@ -17853,10 +17899,10 @@ var AnvilWorldSource = class {
       signal?.addEventListener("abort", abort, { once: true });
       read.promise.then(
         (data) => {
-          if (release2()) resolve(data);
+          if (release()) resolve(data);
         },
         (error) => {
-          if (release2()) reject(error);
+          if (release()) reject(error);
         }
       );
       if (signal?.aborted) abort();