minerender 2.1.0-alpha.60 → 2.1.0-alpha.61

package/dist/browser/index.mjs

@@ -1451,7 +1451,7 @@ var init_Models = __esm({
       }
       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(AssetLoader.persistentKey(itemKey.serialize()), async () => {
+        const model = await this.PERSISTENT_CACHE.getOrLoad(`item-v2:${AssetLoader.persistentKey(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 };
@@ -1460,7 +1460,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 selected.special ? { ...model2, special: selected.special } : model2;
+          return { ...model2, ...selected.special && { special: selected.special }, ...selected.tints && { tints: selected.tints } };
         });
         return model ? { ...model, key: Object.assign(new AssetKey("", ""), model.key) } : void 0;
       }
@@ -1471,7 +1471,7 @@ var init_Models = __esm({
         }
         switch (node.type.replace(/^minecraft:/, "")) {
           case "model":
-            if (typeof node.model === "string" && node.model) return { model: node.model };
+            if (typeof node.model === "string" && node.model) return { model: node.model, tints: node.tints };
             break;
           case "special": {
             if (!node.base || !node.model || typeof node.model !== "object") break;
@@ -4837,6 +4837,87 @@ var init_GuiLight = __esm({
   }
 });
 
+// src/texture/Colormaps.ts
+var Colormaps;
+var init_Colormaps = __esm({
+  "src/texture/Colormaps.ts"() {
+    init_AssetKey();
+    init_ModelTextures();
+    init_Caching();
+    init_MineRenderError();
+    Colormaps = class {
+      /** Samples the selected resource pack's grass colormap using Minecraft's climate coordinates. */
+      static async grassColor(origin, temperature = 0.5, downfall = 1) {
+        const key = AssetKey.parse("textures", "minecraft:colormap/grass", origin);
+        const temp = Math.fround(temperature);
+        const rain = Math.fround(downfall) * temp;
+        const x = Math.floor((1 - temp) * 255), y = Math.floor((1 - rain) * 255);
+        return await Caching.blockTintCache.get(`${key.serialize()}|${x},${y}`, async () => {
+          const image = await ModelTextures.get(key);
+          if (!image) throw new MineRenderError(`Missing grass colormap: ${key.toNamespacedString()}`);
+          if (image.width !== 256 || image.height !== 256) {
+            throw new MineRenderError("Grass colormaps must be 256 \xD7 256 pixels");
+          }
+          const [red, green, blue] = image.data.getImageData(x, y, 1, 1).data;
+          return red << 16 | green << 8 | blue;
+        });
+      }
+    };
+  }
+});
+
+// src/model/ItemTints.ts
+var ItemTints;
+var init_ItemTints = __esm({
+  "src/model/ItemTints.ts"() {
+    init_MineRenderError();
+    init_Colormaps();
+    ItemTints = class {
+      /** Resolves preview colors from item definitions; explicit per-index colors take precedence. */
+      static async get(model, tints) {
+        const sources = model.tints;
+        if (!sources?.length) return tints;
+        const colors = { ...tints };
+        await Promise.all(sources.map(async (source, index) => {
+          if (colors[index] !== void 0) return;
+          switch (source.type) {
+            case "constant":
+            case "minecraft:constant":
+              colors[index] = this.rgb(source.value);
+              break;
+            case "grass":
+            case "minecraft:grass":
+              colors[index] = await Colormaps.grassColor(model.key, source.temperature, source.downfall);
+              break;
+            case "dye":
+            case "minecraft:dye":
+            case "potion":
+            case "minecraft:potion":
+            case "map_color":
+            case "minecraft:map_color":
+            case "firework":
+            case "minecraft:firework":
+            case "team":
+            case "minecraft:team":
+            case "custom_model_data":
+            case "minecraft:custom_model_data":
+              colors[index] = this.rgb(source.default);
+              break;
+            default:
+              throw new MineRenderError(`Unsupported item tint source ${source.type}`);
+          }
+        }));
+        return colors;
+      }
+      static rgb(color) {
+        if (!Array.isArray(color)) return color & 16777215;
+        const [red, green, blue] = color.map((channel) => Math.floor(Math.fround(Math.fround(channel) * 255)));
+        return red << 16 | green << 8 | blue;
+      }
+    };
+  }
+});
+
 // src/model/scene/ModelObject.ts
 import { BoxGeometry as BoxGeometry5, BufferAttribute as BufferAttribute5, Color as Color8, Euler as Euler6, Matrix4 as Matrix49 } from "three";
 function isModelObject(obj) {
@@ -4859,6 +4940,7 @@ var init_ModelObject = __esm({
     init_SpecialItems();
     init_EntityObject();
     init_GuiLight();
+    init_ItemTints();
     p7 = prefix("ModelObject");
     _ModelObject = class _ModelObject extends SceneObject {
       constructor(originalModel, options) {
@@ -4874,6 +4956,7 @@ var init_ModelObject = __esm({
         this.addEventListener("removed", () => this.updateAnimationSubscription());
       }
       async init() {
+        this.options.tints = await ItemTints.get(this.originalModel, this.options.tints);
         const special = this.originalModel.special;
         if (special) {
           const parts = await SpecialItems.getParts(special, this.originalModel.key?.root);
@@ -8761,6 +8844,7 @@ function isInstanceable(obj) {
 init_DisplayPosition();
 init_DisplayTransforms();
 init_GuiLight();
+init_ItemTints();
 init_Model();
 init_ModelCulling();
 init_ModelGenerator();
@@ -8858,10 +8942,7 @@ var BlockStateResolver = class {
 };
 
 // src/model/block/BlockTints.ts
-init_AssetKey();
-init_ModelTextures();
-init_Caching();
-init_MineRenderError();
+init_Colormaps();
 
 // src/model/block/blockTints.json
 var blockTints_default = {
@@ -8916,7 +8997,7 @@ var BlockTints = class {
         color = rule.color;
         break;
       case "grass":
-        color = await this.grassColor(key);
+        color = await Colormaps.grassColor(key);
         break;
       case "redstone": {
         const power = Number(state.power ?? 0) / 15;
@@ -8934,18 +9015,6 @@ var BlockTints = class {
     }
     return { ...Object.fromEntries([...indices].map((index) => [index, color])), ...tints };
   }
-  static async grassColor(origin) {
-    const key = AssetKey.parse("textures", "minecraft:colormap/grass", origin);
-    return await Caching.blockTintCache.get(key.serialize(), async () => {
-      const image = await ModelTextures.get(key);
-      if (!image) throw new MineRenderError(`Missing grass colormap: ${key.toNamespacedString()}`);
-      if (image.width !== 256 || image.height !== 256) {
-        throw new MineRenderError("Grass colormaps must be 256 \xD7 256 pixels");
-      }
-      const [red, green, blue] = image.data.getImageData(127, 127, 1, 1).data;
-      return red << 16 | green << 8 | blue;
-    });
-  }
 };
 
 // src/model/block/scene/BlockObject.ts
@@ -12200,6 +12269,7 @@ var SkinObject = class extends SceneObject {
 
 // src/renderer/MineRenderScene.ts
 init_EntityObject();
+init_ItemTints();
 var _MineRenderScene = class _MineRenderScene extends Scene5 {
   constructor(options) {
     super();
@@ -12292,6 +12362,7 @@ var _MineRenderScene = class _MineRenderScene extends Scene5 {
     }
   }
   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);
   }
   async addBlock(blockState, options, parent = this) {
@@ -13563,6 +13634,7 @@ var Skins = class {
 };
 
 // src/texture/index.ts
+init_Colormaps();
 init_TextureAtlas();
 init_TextureLoader();
 init_Textures();
@@ -14449,6 +14521,7 @@ export {
   CanvasImage,
   Chunk,
   ChunkData,
+  Colormaps,
   CubeFace,
   CubeFaceIndex,
   DEFAULT_ELEMENTS,
@@ -14474,6 +14547,7 @@ export {
   ImageLoader,
   InstanceManager,
   InstanceReference,
+  ItemTints,
   MapControls,
   Materials,
   Meshes,