minerender 2.1.0-alpha.79 → 2.1.0-alpha.80

package/dist/browser/index.mjs

@@ -1490,6 +1490,7 @@ var init_ModelMerger = __esm({
         }
         merged.hierarchy = models.map((m) => m.parent).filter((p10) => `${p10}`);
         merged.hierarchy.push(`${merged.parent}`);
+        if (model.components) merged.components = model.components;
         return merged;
       }
       static async collectAllParents(model) {
@@ -1565,10 +1566,10 @@ var init_Models = __esm({
         const preview = this.snapshotContext(key, context);
         const itemKey = new AssetKey(key.namespace, key.path, "items", void 0, key.rootType, ".json", key.root);
         const cacheKey = itemKey.serialize() + this.contextKey(preview);
-        const model = await this.PERSISTENT_CACHE.getOrLoad(`item-v3:${AssetLoader.persistentKey(cacheKey)}`, async () => {
+        const model = await this.PERSISTENT_CACHE.getOrLoad(`item-v4:${AssetLoader.persistentKey(cacheKey)}`, async () => {
           const result = await AssetLoader.getFirst([itemKey, key], "json" /* JSON */);
           if (!result) return void 0;
-          if (result.key.assetType !== "items") return { ...result.asset, key };
+          if (result.key.assetType !== "items") return { ...result.asset, key, components: preview.components };
           const load = async (selected) => {
             if ("parts" in selected) {
               return { key, parts: await Promise.all(selected.parts.map(load)) };
@@ -1582,7 +1583,7 @@ var init_Models = __esm({
             modelKey.root = key.root;
             const model2 = await this.getRaw(modelKey);
             if (!model2) throw new Error(`Item ${key.toNamespacedString()} references missing model ${selected.model}`);
-            return { ...model2, ...selected.special && { special: selected.special }, ...selected.tints && { tints: selected.tints } };
+            return { ...model2, components: preview.components, ...selected.special && { special: selected.special }, ...selected.tints && { tints: selected.tints } };
           };
           return load(this.selectItemModel(result.asset.model, key, preview));
         });
@@ -1640,7 +1641,7 @@ var init_Models = __esm({
       }
       static contextKey(context) {
         const itemReferences = Object.fromEntries(Object.entries(context.itemReferences).map(([id, key]) => [id, key.serialize()]));
-        return `|item-v3:${JSON.stringify(this.snapshotJson({ ...context, itemReferences }))}`;
+        return `|item-v4:${JSON.stringify(this.snapshotJson({ ...context, itemReferences }))}`;
       }
       static snapshotJson(value, ancestors = /* @__PURE__ */ new Set()) {
         if (value === null || typeof value === "string" || typeof value === "boolean" || typeof value === "number" && Number.isFinite(value)) return value;
@@ -5579,6 +5580,7 @@ var init_ItemTints = __esm({
       static async get(model, tints) {
         const sources = model.tints;
         if (!sources?.length) return tints;
+        const components = model.components ?? {};
         const colors = { ...tints };
         await Promise.all(sources.map(async (source, index) => {
           if (colors[index] !== void 0) return;
@@ -5593,27 +5595,71 @@ var init_ItemTints = __esm({
               break;
             case "dye":
             case "minecraft:dye":
+              colors[index] = this.colorOrDefault(components["minecraft:dyed_color"], source.default, true);
+              break;
             case "potion":
-            case "minecraft:potion":
+            case "minecraft:potion": {
+              const value = typeof components["minecraft:potion_contents"] === "string" ? void 0 : this.componentField(components, "potion_contents", "custom_color");
+              colors[index] = this.colorOrDefault(value, source.default);
+              break;
+            }
             case "map_color":
             case "minecraft:map_color":
+              colors[index] = this.colorOrDefault(components["minecraft:map_color"], source.default);
+              break;
             case "firework":
-            case "minecraft:firework":
+            case "minecraft:firework": {
+              const values = this.componentField(components, "firework_explosion", "colors");
+              if (values !== void 0 && !Array.isArray(values)) throw new MineRenderError("Item tint firework_explosion.colors must be an array");
+              if (!values?.length) {
+                colors[index] = this.rgb(source.default);
+                break;
+              }
+              const rgb = values.map((value) => this.componentColor(value));
+              const red = Math.floor(rgb.reduce((sum, color2) => sum + (color2 >> 16 & 255), 0) / rgb.length);
+              const green = Math.floor(rgb.reduce((sum, color2) => sum + (color2 >> 8 & 255), 0) / rgb.length);
+              const blue = Math.floor(rgb.reduce((sum, color2) => sum + (color2 & 255), 0) / rgb.length);
+              colors[index] = red << 16 | green << 8 | blue;
+              break;
+            }
             case "team":
             case "minecraft:team":
-            case "custom_model_data":
-            case "minecraft:custom_model_data":
               colors[index] = this.rgb(source.default);
               break;
+            case "custom_model_data":
+            case "minecraft:custom_model_data": {
+              const colorIndex = source.index ?? 0;
+              if (!Number.isSafeInteger(colorIndex) || colorIndex < 0) throw new MineRenderError("Item tint custom_model_data index must be a nonnegative integer");
+              const values = this.componentField(components, "custom_model_data", "colors");
+              if (values !== void 0 && !Array.isArray(values)) throw new MineRenderError("Item tint custom_model_data.colors must be an array");
+              colors[index] = this.colorOrDefault(values?.[colorIndex], source.default, true);
+              break;
+            }
             default:
               throw new MineRenderError(`Unsupported item tint source ${source.type}`);
           }
         }));
         return colors;
       }
+      static componentField(components, id, field) {
+        const value = components[`minecraft:${id}`];
+        if (value === void 0) return void 0;
+        if (!value || typeof value !== "object" || Array.isArray(value)) throw new MineRenderError(`Item tint ${id} must be an object`);
+        return value[field];
+      }
+      static colorOrDefault(value, fallback, allowTriple = false) {
+        return value === void 0 ? this.rgb(fallback) : this.componentColor(value, allowTriple);
+      }
+      static componentColor(value, allowTriple = false) {
+        if (typeof value === "number" && Number.isInteger(value) && value >= -2147483648 && value <= 2147483647) return this.rgb(value);
+        if (allowTriple && Array.isArray(value) && value.length === 3 && value.every((channel) => typeof channel === "number" && Number.isFinite(channel))) {
+          return this.rgb(value) & 16777215;
+        }
+        throw new MineRenderError(`Item tint component color must be a packed integer${allowTriple ? " or RGB triple" : ""}`);
+      }
       static rgb(color2) {
         if (!Array.isArray(color2)) return color2 & 16777215;
-        const [red, green, blue] = color2.map((channel) => Math.floor(Math.fround(Math.fround(channel) * 255)));
+        const [red, green, blue] = color2.map((channel) => Math.floor(Math.fround(Math.fround(channel) * 255)) & 255);
         return red << 16 | green << 8 | blue;
       }
     };
@@ -9977,7 +10023,7 @@ var GuiObject = class extends SceneObject {
   }
   async createItem(layer, index) {
     const key = typeof layer.item === "string" ? AssetKey.parse("models", layer.item) : layer.item;
-    const model = await Models.getMerged(key);
+    const model = await Models.getMerged(key, { ...layer.context, displayContext: "gui" /* GUI */ });
     if (!model) throw new Error(`Could not load GUI item ${key.toNamespacedString()}`);
     const item = new ModelObject(model, {
       displayPosition: "gui" /* GUI */,
@@ -14006,6 +14052,7 @@ var _MineRenderScene = class _MineRenderScene extends Scene4 {
   async addSceneObject(asset2, objectSupplier, _options, parent = this) {
     this.dirty = true;
     const obj = await objectSupplier();
+    if (isModelObject(obj)) obj.options.tints = await ItemTints.get(obj.originalModel, obj.options.tints);
     if (obj?.options?.instanceMeshes && asset2.key && asset2.key?.assetType === "models") {
       let key = asset2.key.serialize();
       if (isModelObject(obj)) {
@@ -14039,7 +14086,6 @@ var _MineRenderScene = class _MineRenderScene extends Scene4 {
    * @returns The model, or a reference to one placement of a shared model.
    */
   async addModel(model, options, parent = this) {
-    options = { ...options, tints: await ItemTints.get(model, options?.tints) };
     return this.addSceneObject(model, () => new ModelObject(model, options), options, parent);
   }
   /**