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

package/dist/node/index.d.mts

@@ -716,6 +716,7 @@ declare class DefaultBlockStates implements MinecraftAsset {
 
 interface EntityModel {
     key: BasicAssetKey;
+    texture?: AssetKey;
     layer: EntityModelLayer;
     id: string;
 }
@@ -725,6 +726,7 @@ interface EntityModelFile extends MinecraftAsset {
 }
 interface EntityModelLayer {
     texture: [number, number];
+    textureLocation?: string;
     root: EntityModelPart;
 }
 interface EntityModelPart {
@@ -748,6 +750,7 @@ interface EntityModelCube {
 declare class Entities {
     static getEntityList(): Promise<string[]>;
     static getEntity(modelKey: BasicAssetKey, textureKey?: BasicAssetKey, options?: EntityModelOptions): Promise<Maybe<EntityModel>>;
+    static resolveTexture(modelKey: BasicAssetKey): Promise<Maybe<AssetKey>>;
     /** @deprecated Use getEntityList(); block entities share the entity dataset. */
     static getBlockList(): Promise<string[]>;
     /** @deprecated Use getEntity(); block entities share the entity dataset. */
@@ -1291,6 +1294,7 @@ declare class Caching {
     static readonly defaultBlockStatesCache: AsyncLoadingCache<CacheKey, DefaultBlockStates>;
     static readonly blockTintCache: AsyncLoadingCache<CacheKey, number>;
     static readonly entityModelCache: AsyncLoadingCache<CacheKey, EntityModelFile>;
+    static readonly entityTextureCache: AsyncLoadingCache<CacheKey, AssetKey>;
     private static createAssetCache;
     /** Every cache above, so clear()/end() can never fall out of sync with the field list again. */
     private static get all();

package/dist/node/index.d.ts

@@ -716,6 +716,7 @@ declare class DefaultBlockStates implements MinecraftAsset {
 
 interface EntityModel {
     key: BasicAssetKey;
+    texture?: AssetKey;
     layer: EntityModelLayer;
     id: string;
 }
@@ -725,6 +726,7 @@ interface EntityModelFile extends MinecraftAsset {
 }
 interface EntityModelLayer {
     texture: [number, number];
+    textureLocation?: string;
     root: EntityModelPart;
 }
 interface EntityModelPart {
@@ -748,6 +750,7 @@ interface EntityModelCube {
 declare class Entities {
     static getEntityList(): Promise<string[]>;
     static getEntity(modelKey: BasicAssetKey, textureKey?: BasicAssetKey, options?: EntityModelOptions): Promise<Maybe<EntityModel>>;
+    static resolveTexture(modelKey: BasicAssetKey): Promise<Maybe<AssetKey>>;
     /** @deprecated Use getEntityList(); block entities share the entity dataset. */
     static getBlockList(): Promise<string[]>;
     /** @deprecated Use getEntity(); block entities share the entity dataset. */
@@ -1291,6 +1294,7 @@ declare class Caching {
     static readonly defaultBlockStatesCache: AsyncLoadingCache<CacheKey, DefaultBlockStates>;
     static readonly blockTintCache: AsyncLoadingCache<CacheKey, number>;
     static readonly entityModelCache: AsyncLoadingCache<CacheKey, EntityModelFile>;
+    static readonly entityTextureCache: AsyncLoadingCache<CacheKey, AssetKey>;
     private static createAssetCache;
     /** Every cache above, so clear()/end() can never fall out of sync with the field list again. */
     private static get all();

package/dist/node/index.js

@@ -561,6 +561,9 @@ var Caching = class _Caching {
   static {
     this.entityModelCache = _Caching.createAssetCache();
   }
+  static {
+    this.entityTextureCache = _Caching.createAssetCache();
+  }
   static createAssetCache() {
     return import_loading_cache.Caches.builder().expireAfterWrite(import_time.Time.minutes(10)).expireAfterAccess(import_time.Time.minutes(5)).expirationInterval(import_time.Time.seconds(30)).buildAsync();
   }
@@ -584,7 +587,8 @@ var Caching = class _Caching {
       this.listAssetCache,
       this.defaultBlockStatesCache,
       this.blockTintCache,
-      this.entityModelCache
+      this.entityModelCache,
+      this.entityTextureCache
     ];
   }
   static clear() {
@@ -2882,7 +2886,37 @@ var Entities = class {
     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 name = path.split("/").pop();
+      for (const candidate of [path, `${path}/${name}`]) {
+        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", `${name}_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), `${name}_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() {
@@ -3331,6 +3365,7 @@ var EntityObject = class _EntityObject extends SceneObject {
     super.dispose();
   }
   get textureKey() {
+    if (this.entity.texture) return this.entity.texture;
     const key = this.entity.key;
     return new AssetKey(
       key.namespace,