minerender 2.1.0-alpha.24 → 2.1.0-alpha.26

package/dist/bundle.js

@@ -66380,7 +66380,8 @@ return ${compiler2.callType("value", tagType)}
         this.listAssetCache,
         this.defaultBlockStatesCache,
         this.blockTintCache,
-        this.entityModelCache
+        this.entityModelCache,
+        this.entityTextureCache
       ];
     }
     static clear() {
@@ -66424,6 +66425,7 @@ return ${compiler2.callType("value", tagType)}
   _Caching.defaultBlockStatesCache = _Caching.createAssetCache();
   _Caching.blockTintCache = _Caching.createAssetCache();
   _Caching.entityModelCache = _Caching.createAssetCache();
+  _Caching.entityTextureCache = _Caching.createAssetCache();
   var Caching = _Caching;
 
   // src/Geometries.ts
@@ -78296,7 +78298,37 @@ return ${compiler2.callType("value", tagType)}
       if (!layer) {
         throw new MineRenderError(`Entity ${model.id} has no layer "${layerName}". Available layers: ${Object.keys(model.layers).join(", ")}`);
       }
-      return { key: textureKey ?? modelKey, layer, id: model.id };
+      let texture;
+      if (textureKey) {
+        const path2 = isAssetKey(textureKey) ? textureKey.getFullPath() : textureKey.path;
+        texture = isAssetKey(textureKey) && textureKey.assetType === "textures" && path2.startsWith("entity/") ? textureKey : new AssetKey(textureKey.namespace, path2, "textures", "entity", "assets", ".png", isAssetKey(textureKey) ? textureKey.root : void 0);
+      } else if (layer.textureLocation !== void 0) {
+        texture = AssetKey.parse("textures", layer.textureLocation.replace(/^([^:]+:)?textures\//, "$1"));
+      } else {
+        texture = await this.resolveTexture(modelKey);
+      }
+      return { key: textureKey ?? modelKey, texture, layer, id: model.id };
+    }
+    static async resolveTexture(modelKey) {
+      const path = isAssetKey(modelKey) ? modelKey.getFullPath() : modelKey.path;
+      const key = new AssetKey(modelKey.namespace, path, void 0, void 0, "entity-models", ".json");
+      return Caching.entityTextureCache.get(key.serialize(), async () => {
+        const name2 = path.split("/").pop();
+        for (const candidate of [path, `${path}/${name2}`]) {
+          const texture = new AssetKey(modelKey.namespace, candidate, "textures", "entity", "assets", ".png");
+          if (await ModelTextures.get(texture)) return texture;
+        }
+        const listKey = new AssetKey(modelKey.namespace, "_list", `${name2}_variant`, void 0, "data", ".json");
+        const list = await AssetLoader.get(listKey, "list" /* LIST */);
+        const files = list?.files.filter((file2) => file2.endsWith(".json") && file2 !== "_list.json");
+        const file = files?.find((file2) => file2 === "temperate.json") ?? files?.[0];
+        if (!file) return void 0;
+        const variantKey = new AssetKey(modelKey.namespace, file.slice(0, -5), `${name2}_variant`, void 0, "data", ".json");
+        const variant = await AssetLoader.get(variantKey, "json" /* JSON */);
+        const assets = variant?.assets;
+        const textureId = variant?.asset_id ?? (typeof assets?.wild === "string" ? assets.wild : Object.values(assets ?? {}).find((value) => typeof value === "string"));
+        return typeof textureId === "string" ? AssetKey.parse("textures", textureId) : void 0;
+      });
     }
     /** @deprecated Use getEntityList(); block entities share the entity dataset. */
     static getBlockList() {
@@ -78800,6 +78832,7 @@ return ${compiler2.callType("value", tagType)}
       super.dispose();
     }
     get textureKey() {
+      if (this.entity.texture) return this.entity.texture;
       const key = this.entity.key;
       return new AssetKey(
         key.namespace,