minerender 2.1.0-alpha.12 → 2.1.0-alpha.14

package/dist/browser/index.d.mts

@@ -14,7 +14,7 @@ interface AnimatorFunction {
 }
 
 declare enum Axis {
-    X = "X",
+    X = "x",
     Y = "y",
     Z = "z"
 }
@@ -670,6 +670,11 @@ declare class AssetLoader {
     static getAll<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<T[]>;
     /** Returns the first defined result in source-priority order, without merging assets. */
     static get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
+    /** Tries each path within a source before considering lower-priority sources. */
+    static getFirst<T extends MinecraftAsset>(keys: readonly AssetKey[], parser: AssetParser | string): Promise<Maybe<{
+        key: AssetKey;
+        asset: T;
+    }>>;
 }
 
 interface BlockState extends MinecraftAsset {
@@ -695,7 +700,7 @@ interface MultipartCondition {
     [key: string]: string;
 }
 
-declare const DEFAULT_ROOT = "https://assets.mcasset.cloud/1.17.1";
+declare const DEFAULT_ROOT = "https://assets.mcasset.cloud/1.21.11";
 declare const DEFAULT_NAMESPACE = "minecraft";
 declare class Assets {
     /**
@@ -760,6 +765,8 @@ declare class Models {
     private static get PERSISTENT_CACHE();
     static getItemList(): Promise<string[]>;
     static loadAndMerge(key: AssetKey): Promise<Maybe<Model>>;
+    private static getItemModel;
+    private static defaultItemModel;
     static getRaw(key: AssetKey): Promise<Maybe<Model>>;
     static getMerged(key: AssetKey): Promise<Maybe<Model>>;
     static get(key: AssetKey): Promise<Maybe<Model>>;

package/dist/browser/index.d.ts

@@ -14,7 +14,7 @@ interface AnimatorFunction {
 }
 
 declare enum Axis {
-    X = "X",
+    X = "x",
     Y = "y",
     Z = "z"
 }
@@ -670,6 +670,11 @@ declare class AssetLoader {
     static getAll<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<T[]>;
     /** Returns the first defined result in source-priority order, without merging assets. */
     static get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
+    /** Tries each path within a source before considering lower-priority sources. */
+    static getFirst<T extends MinecraftAsset>(keys: readonly AssetKey[], parser: AssetParser | string): Promise<Maybe<{
+        key: AssetKey;
+        asset: T;
+    }>>;
 }
 
 interface BlockState extends MinecraftAsset {
@@ -695,7 +700,7 @@ interface MultipartCondition {
     [key: string]: string;
 }
 
-declare const DEFAULT_ROOT = "https://assets.mcasset.cloud/1.17.1";
+declare const DEFAULT_ROOT = "https://assets.mcasset.cloud/1.21.11";
 declare const DEFAULT_NAMESPACE = "minecraft";
 declare class Assets {
     /**
@@ -760,6 +765,8 @@ declare class Models {
     private static get PERSISTENT_CACHE();
     static getItemList(): Promise<string[]>;
     static loadAndMerge(key: AssetKey): Promise<Maybe<Model>>;
+    private static getItemModel;
+    private static defaultItemModel;
     static getRaw(key: AssetKey): Promise<Maybe<Model>>;
     static getMerged(key: AssetKey): Promise<Maybe<Model>>;
     static get(key: AssetKey): Promise<Maybe<Model>>;

package/dist/browser/index.js

@@ -434,7 +434,7 @@ registerBrowserEnv();
 // src/Axis.ts
 var import_three = require("three");
 var Axis = /* @__PURE__ */ ((Axis3) => {
-  Axis3["X"] = "X";
+  Axis3["X"] = "x";
   Axis3["Y"] = "y";
   Axis3["Z"] = "z";
   return Axis3;
@@ -442,7 +442,7 @@ var Axis = /* @__PURE__ */ ((Axis3) => {
 var AXES = Object.values(Axis);
 function axisToVec3(axis) {
   switch (axis) {
-    case "X" /* X */:
+    case "x" /* X */:
       return new import_three.Vector3(1, 0, 0);
     case "y" /* Y */:
       return new import_three.Vector3(0, 1, 0);
@@ -1295,7 +1295,7 @@ var AssetKey = class _AssetKey extends BasicAssetKey {
   }
   toString() {
     let a = [
-      typeof this.root !== "undefined" || AssetLoader.ROOT !== DEFAULT_ROOT ? this.root ?? AssetLoader.ROOT : "__root__",
+      this.root ?? AssetLoader.ROOT,
       this.rootType ?? "__rootType__",
       this.assetType ?? "__assetType__",
       this.type ?? "__type__",
@@ -1332,9 +1332,9 @@ var ModelMerger = class {
     const models = await this.collectAllParents(model);
     let merged = {};
     for (let parentModel of models) {
-      merged = (0, import_ts_deepmerge.default)(merged, parentModel);
+      merged = import_ts_deepmerge.default.withOptions({ mergeArrays: false }, merged, parentModel);
     }
-    merged = (0, import_ts_deepmerge.default)(merged, model);
+    merged = import_ts_deepmerge.default.withOptions({ mergeArrays: false }, merged, model);
     merged.hierarchy = models.map((m) => m.parent).filter((p12) => `${p12}`);
     merged.hierarchy.push(`${merged.parent}`);
     return merged;
@@ -1345,6 +1345,7 @@ var ModelMerger = class {
     }
     const models = [];
     const parentKey = AssetKey.parse("models", model.parent);
+    parentKey.root = model.key?.root;
     const parentModel = await Models.getRaw(parentKey);
     if (parentModel) {
       models.unshift(parentModel);
@@ -1374,26 +1375,58 @@ var Models = class _Models {
     return this._persistentCache ?? (this._persistentCache = PersistentCache.open("minerender-models"));
   }
   static async getItemList() {
-    const key = new AssetKey(
-      DEFAULT_NAMESPACE,
-      "_list",
-      "models",
-      "item",
-      "assets",
-      ".json",
-      DEFAULT_ROOT
-    );
-    return Caching.listAssetCache.get(key.serialize(), () => {
-      return AssetLoader.get(key, "list" /* LIST */);
+    const key = new AssetKey(DEFAULT_NAMESPACE, "_list", "items");
+    const legacyKey = new AssetKey(DEFAULT_NAMESPACE, "_list", "models", "item");
+    return Caching.listAssetCache.get(key.serialize(), async () => {
+      return (await AssetLoader.getFirst([key, legacyKey], "list" /* LIST */))?.asset;
     }).then((r) => r?.files ?? []);
   }
   static async loadAndMerge(key) {
-    const model = await this.getRaw(key);
+    const model = key.type === "item" ? await this.getItemModel(key) : await this.getRaw(key);
     if (!model) {
       return void 0;
     }
     return ModelMerger.mergeWithParents(model);
   }
+  static async getItemModel(key) {
+    const itemKey = new AssetKey(key.namespace, key.path, "items", void 0, key.rootType, ".json", key.root);
+    const model = await this.PERSISTENT_CACHE.getOrLoad(itemKey.serialize(), async () => {
+      const result = await AssetLoader.getFirst([itemKey, key], "json" /* JSON */);
+      if (!result) return void 0;
+      if (result.key.assetType !== "items") return { ...result.asset, key };
+      const reference = this.defaultItemModel(result.asset.model, key);
+      const modelKey = AssetKey.parse("models", reference);
+      modelKey.root = key.root;
+      const model2 = await this.getRaw(modelKey);
+      if (!model2) throw new Error(`Item ${key.toNamespacedString()} references missing model ${reference}`);
+      return model2;
+    });
+    return model ? { ...model, key: Object.assign(new AssetKey("", ""), model.key) } : void 0;
+  }
+  // Item previews use the GUI context, false conditions, and zero numeric properties.
+  static defaultItemModel(node, key) {
+    if (!node || typeof node.type !== "string") {
+      throw new Error(`Unsupported item model definition for ${key.toNamespacedString()}`);
+    }
+    switch (node.type.replace(/^minecraft:/, "")) {
+      case "model":
+        if (typeof node.model === "string" && node.model) return node.model;
+        break;
+      case "condition":
+        return this.defaultItemModel(node.on_false, key);
+      case "select": {
+        const selected = node.property?.replace(/^minecraft:/, "") === "display_context" ? node.cases?.find((entry) => Array.isArray(entry.when) ? entry.when.includes("gui") : entry.when === "gui")?.model : void 0;
+        return this.defaultItemModel(selected ?? node.fallback, key);
+      }
+      case "range_dispatch": {
+        const selected = node.entries?.reduce((match, entry) => {
+          return entry.threshold <= 0 && (!match || entry.threshold >= match.threshold) ? entry : match;
+        }, void 0);
+        return this.defaultItemModel(selected?.model ?? node.fallback, key);
+      }
+    }
+    throw new Error(`Unsupported item model ${node?.type ?? "definition"} for ${key.toNamespacedString()}`);
+  }
   static async getRaw(key) {
     if (!key.assetType) {
       key.assetType = "models";
@@ -1500,7 +1533,7 @@ var DefaultBlockStates = class {
 };
 
 // src/assets/Assets.ts
-var DEFAULT_ROOT = "https://assets.mcasset.cloud/1.17.1";
+var DEFAULT_ROOT = "https://assets.mcasset.cloud/1.21.11";
 var DEFAULT_NAMESPACE = "minecraft";
 var Assets = class {
   /**
@@ -1561,7 +1594,7 @@ function applyElementRotation(rotation, geometry) {
   const origin = new import_three7.Vector3(rotation.origin[0], rotation.origin[1], rotation.origin[2]);
   geometry.translate(-origin.x, -origin.y, -origin.z);
   switch (rotation.axis) {
-    case "X" /* X */:
+    case "x" /* X */:
       geometry.rotateX(toRadians(rotation.angle));
       break;
     case "y" /* Y */:
@@ -1592,7 +1625,7 @@ function applyModelPartRotation(modelPart, geometry) {
 }
 function applyGenericRotation(axis, rotation, obj) {
   switch (axis) {
-    case "X" /* X */:
+    case "x" /* X */:
       obj.rotateOnAxis(new import_three7.Vector3(1, 0, 0), toRadians(rotation));
       break;
     case "y" /* Y */:
@@ -1918,11 +1951,29 @@ var _AssetLoader = class _AssetLoader {
   }
   /** Returns the first defined result in source-priority order, without merging assets. */
   static async get(key, parser) {
+    const keys = [key];
+    if (key.rootType === "data" && (key.assetType === "structure" || key.assetType === "structures")) {
+      keys.push(new AssetKey(
+        key.namespace,
+        key.path,
+        key.assetType === "structure" ? "structures" : "structure",
+        key.type,
+        key.rootType,
+        key.extension,
+        key.root
+      ));
+    }
+    return (await this.getFirst(keys, parser))?.asset;
+  }
+  /** Tries each path within a source before considering lower-priority sources. */
+  static async getFirst(keys, parser) {
     const sources = [...this._SOURCES];
     for (const source of sources) {
-      const result = await source.source.get(key, parser);
-      if (result !== void 0) {
-        return result;
+      for (const key of keys) {
+        const result = await source.source.get(key, parser);
+        if (result !== void 0) {
+          return { key, asset: result };
+        }
       }
     }
     return void 0;
@@ -2452,17 +2503,13 @@ var UVMapper = class {
               this.setCubeFaceUvInArray(uv, faceIndex * 4, [0, 1, 8 / size, (size - 8) / size]);
               continue;
             }
+            if (!face.texture) continue;
             if (!face.uv) {
               face.uv = this.getFallbackUv(element, faceName);
             }
-            let faceTexture = face.texture;
-            let texPosition;
-            let texSize;
-            if (faceTexture) {
-              faceTexture = faceTexture.substr(1);
-              texPosition = positions[faceTexture] || [0, 0];
-              texSize = sizes[faceTexture] || [16, 16];
-            }
+            const faceTexture = face.texture.substr(1);
+            const texPosition = positions[faceTexture] || [0, 0];
+            const texSize = sizes[faceTexture] || [16, 16];
             let texPosV = new import_three8.Vector2(texPosition[0], texPosition[1]);
             const [tl, tr, bl, br] = this.expandAndRotateMcUvs(face.uv, face.rotation, texSize[0], texSize[1]);
             tl.add(texPosV);