minerender 2.1.0-alpha.82 → 2.1.0-alpha.84

package/dist/browser/index.mjs

@@ -260,7 +260,8 @@ var init_Caching = __esm({
           this.entityTextureCache,
           this.entityAnimationCache,
           this.blockEntityIndexCache,
-          this.fontCache
+          this.fontCache,
+          this.bannerPatternCache
         ];
       }
       /** Invalidates in-memory entries so later lookups reload them. Persisted entries are retained. */
@@ -309,6 +310,7 @@ var init_Caching = __esm({
     _Caching.entityAnimationCache = _Caching.createAssetCache();
     _Caching.blockEntityIndexCache = _Caching.createAssetCache();
     _Caching.fontCache = _Caching.createAssetCache();
+    _Caching.bannerPatternCache = _Caching.createAssetCache();
     Caching = _Caching;
   }
 });
@@ -941,6 +943,7 @@ var init_Materials = __esm({
             material.depthWrite = false;
             break;
           case "eyes":
+          case "no_outline":
             material.transparent = true;
             material.alphaTest = 0;
             material.depthWrite = false;
@@ -1529,6 +1532,79 @@ var init_AssetParsers = __esm({
   }
 });
 
+// src/assets/BannerPatterns.ts
+var DYE_COLORS, BannerPatterns;
+var init_BannerPatterns = __esm({
+  "src/assets/BannerPatterns.ts"() {
+    init_AssetKey();
+    init_AssetLoader();
+    init_AssetParsers();
+    init_Caching();
+    DYE_COLORS = Object.freeze({
+      white: 16383998,
+      orange: 16351261,
+      magenta: 13061821,
+      light_blue: 3847130,
+      yellow: 16701501,
+      lime: 8439583,
+      pink: 15961002,
+      gray: 4673362,
+      light_gray: 10329495,
+      cyan: 1481884,
+      purple: 8991416,
+      blue: 3949738,
+      brown: 8606770,
+      green: 6192150,
+      red: 11546150,
+      black: 1908001
+    });
+    BannerPatterns = class {
+      /** Lists namespaced pattern IDs from the selected namespace's data directory. */
+      static async getList(namespace = "minecraft", root) {
+        const collect = async (path) => {
+          const prefix2 = path ? `${path}/` : "";
+          const key = new AssetKey(namespace, `${prefix2}_list`, "banner_pattern", void 0, "data", ".json", root);
+          const list2 = await Caching.listAssetCache.get(key.serialize(), () => AssetLoader.get(key, "list" /* LIST */));
+          if (!list2) return [];
+          const files = list2.files.filter((file) => file.endsWith(".json") && file !== "_list.json").map((file) => `${namespace}:${prefix2}${file.slice(0, -5)}`);
+          const children = await Promise.all(list2.directories.map((directory) => collect(`${prefix2}${directory}`)));
+          return [...files, ...children.flat()];
+        };
+        return collect("");
+      }
+      /** Returns the named dye's sRGB value, rejecting unknown colors. */
+      static getColor(color2) {
+        if (typeof color2 !== "string" || !Object.prototype.hasOwnProperty.call(DYE_COLORS, color2)) throw new Error(`Unsupported dye color ${color2}`);
+        return DYE_COLORS[color2];
+      }
+      /** Resolves the first 16 layers of a `banner_patterns` component, preserving their order. */
+      static async getLayers(value, target, root) {
+        if (value === void 0) return [];
+        if (!Array.isArray(value)) throw new Error("banner_patterns must be an array");
+        return Promise.all(value.slice(0, 16).map(async (layer) => {
+          if (!layer || typeof layer !== "object" || Array.isArray(layer)) throw new Error("Each banner pattern requires a pattern and dye color");
+          const color2 = this.getColor(layer.color);
+          let pattern2 = layer.pattern;
+          if (typeof pattern2 === "string") {
+            const id = this.identifier(pattern2);
+            const key = new AssetKey(id.namespace, id.getFullPath(), "banner_pattern", void 0, "data", ".json", root);
+            pattern2 = await Caching.bannerPatternCache.get(key.serialize(), () => AssetLoader.get(key, "json" /* JSON */));
+            if (!pattern2) throw new Error(`Missing banner pattern ${layer.pattern}`);
+          }
+          if (!pattern2 || typeof pattern2 !== "object" || Array.isArray(pattern2) || typeof pattern2.translation_key !== "string") throw new Error("Banner patterns require asset_id and translation_key");
+          const asset2 = this.identifier(pattern2.asset_id);
+          return { color: color2, texture: new AssetKey(asset2.namespace, `${target}/${asset2.getFullPath()}`, "textures", "entity", "assets", ".png", root) };
+        }));
+      }
+      static identifier(value) {
+        if (typeof value !== "string" || !/^(?:[a-z0-9_.-]+:)?[a-z0-9_./-]+$/.test(value)) throw new Error(`Invalid banner-pattern identifier ${value}`);
+        const [namespace, path] = value.includes(":") ? value.split(":") : ["minecraft", value];
+        return new AssetKey(namespace, path);
+      }
+    };
+  }
+});
+
 // src/assets/Models.ts
 var Models;
 var init_Models = __esm({
@@ -1541,6 +1617,7 @@ var init_Models = __esm({
     init_AssetKey();
     init_AssetParsers();
     init_DisplayPosition();
+    init_BannerPatterns();
     Models = class _Models {
       // opened lazily: touching the store at import time would hit IndexedDB/disk just for loading
       // the library, and would require an EnvProvider before any entry has had a chance to register
@@ -1730,6 +1807,17 @@ var init_Models = __esm({
             if (!node.base || !node.model || typeof node.model !== "object") break;
             const special = node.model;
             switch (special.type) {
+              case "banner":
+              case "minecraft:banner":
+                if (typeof special.color === "string" && Object.prototype.hasOwnProperty.call(DYE_COLORS, special.color)) return { model: node.base, special };
+                break;
+              case "shield":
+              case "minecraft:shield":
+              case "trident":
+              case "minecraft:trident":
+              case "conduit":
+              case "minecraft:conduit":
+                return { model: node.base, special };
               case "shulker_box":
               case "minecraft:shulker_box":
                 if (typeof special.texture === "string" && special.texture && (special.openness === void 0 || typeof special.openness === "number" && Number.isFinite(special.openness)) && (special.orientation === void 0 || ["down", "up", "north", "south", "west", "east"].includes(special.orientation))) {
@@ -5440,9 +5528,11 @@ var init_SpecialItems = __esm({
   "src/model/SpecialItems.ts"() {
     init_AssetKey();
     init_Entities();
+    init_BannerPatterns();
+    init_ModelTextures();
     SpecialItems = class {
       /** Resolves the static entity parts drawn by a special item renderer, in model units. */
-      static async getParts(special, root) {
+      static async getParts(special, root, components = {}) {
         const texture = (id, directory) => {
           const key = AssetKey.parse("textures", id);
           return new AssetKey(
@@ -5455,13 +5545,77 @@ var init_SpecialItems = __esm({
             root
           );
         };
-        const load = async (id, textureKey, transform, rotations = {}) => {
+        const load = async (id, textureKey, transform, rotations = {}, layers = ["main"]) => {
           const key = new AssetKey("minecraft", id, void 0, void 0, "entity-models", ".json", root);
-          const model = await Entities.getEntity(key, textureKey, { layer: "main" });
+          const model = await Entities.getEntity(key, textureKey, layers.length === 1 ? { layer: layers[0] } : {
+            layers,
+            textures: textureKey ? Object.fromEntries(layers.map((name) => [name, textureKey])) : void 0
+          });
           if (!model) throw new Error(`Missing entity model minecraft:${id} for special item ${special.type}`);
           return { model, transform, rotations };
         };
         switch (special.type) {
+          case "minecraft:trident":
+          case "trident":
+          case "minecraft:conduit":
+          case "conduit": {
+            const trident = special.type === "trident" || special.type === "minecraft:trident";
+            const part = await load(
+              trident ? "trident" : "conduit",
+              texture(trident ? "trident" : "conduit/base", ""),
+              trident ? new Matrix48().makeScale(1, -1, -1) : new Matrix48().makeTranslation(8, 8, 8),
+              {},
+              trident ? ["main"] : ["shell"]
+            );
+            part.model = { ...part.model, render: "solid", layers: part.model.layers && Object.fromEntries(
+              Object.entries(part.model.layers).map(([name, layer]) => [name, { ...layer, render: "solid" }])
+            ) };
+            return [part];
+          }
+          case "minecraft:banner":
+          case "banner":
+          case "minecraft:shield":
+          case "shield": {
+            const banner = special.type === "banner" || special.type === "minecraft:banner";
+            const color2 = banner ? BannerPatterns.getColor(special.color) : components["minecraft:base_color"] === void 0 ? void 0 : BannerPatterns.getColor(components["minecraft:base_color"]);
+            const patterns = await BannerPatterns.getLayers(components["minecraft:banner_patterns"], banner ? "banner" : "shield", root);
+            const patterned = banner || color2 !== void 0 || patterns.length > 0;
+            const baseTexture = texture(banner ? "banner_base" : patterned ? "shield_base" : "shield_base_nopattern", "");
+            const transform = banner ? new Matrix48().makeTranslation(8, 0, 8).multiply(new Matrix48().makeScale(2 / 3, -2 / 3, -2 / 3)) : new Matrix48().makeScale(1, -1, -1);
+            const part = await load(banner ? "standing_banner" : "shield", baseTexture, transform, {}, banner ? ["main", "flag"] : ["main"]);
+            const layers = Object.fromEntries(Object.entries(part.model.layers ?? { main: part.model }).map(([name, layer]) => [name, { ...layer, render: "solid" }]));
+            let overlay2;
+            if (banner) {
+              const flagLayer = layers.flag;
+              const flag = flagLayer?.layer.root.children.flag;
+              if (!flag) throw new Error("Banner entity model is missing its flag layer");
+              overlay2 = { ...flagLayer.layer, root: { ...flagLayer.layer.root, children: {
+                ...flagLayer.layer.root.children,
+                flag: { ...flag, pose: { ...flag.pose, rotation: [-25e-4 * Math.PI, flag.pose.rotation[1], flag.pose.rotation[2]] } }
+              } } };
+              layers.flag = { ...flagLayer, layer: overlay2 };
+            } else {
+              const main = layers.main.layer;
+              const plate = main.root.children.plate;
+              if (!plate) throw new Error("Shield entity model is missing its plate");
+              overlay2 = { ...main, root: { ...main.root, cubes: [], children: { plate } } };
+            }
+            const tints = {};
+            if (patterned) {
+              const draws = [{ texture: texture(`${banner ? "banner" : "shield"}/base`, ""), color: color2 ?? DYE_COLORS.white }, ...patterns];
+              draws.forEach((draw, index) => {
+                const name = index === 0 ? "pattern_base" : `pattern_${index - 1}`;
+                layers[name] = { key: draw.texture, texture: draw.texture, layer: overlay2, render: "no_outline", tint: name };
+                tints[name] = draw.color;
+              });
+            }
+            await Promise.all([...new Map(Object.values(layers).map((layer) => [layer.texture.serialize(), layer.texture])).values()].map(async (key) => {
+              if (!await ModelTextures.preload(key)) throw new Error(`Missing special item texture ${key.toNamespacedString()}`);
+            }));
+            part.model = { ...part.model, ...layers.main, layers };
+            part.tints = tints;
+            return [part];
+          }
           case "minecraft:chest":
           case "chest": {
             const angle = -(special.openness ?? 0) * Math.PI / 2;
@@ -5756,12 +5910,12 @@ var init_ModelObject = __esm({
         this.options.tints = await ItemTints.get(this.originalModel, this.options.tints);
         const special = this.originalModel.special;
         if (special) {
-          const parts2 = await SpecialItems.getParts(special, this.originalModel.key?.root);
+          const parts2 = await SpecialItems.getParts(special, this.originalModel.key?.root, this.originalModel.components);
           const transform = this.options.displayPosition ? DisplayTransforms.getMatrix(this.originalModel.display, this.options.displayPosition) : new Matrix49();
           transform.multiply(new Matrix49().makeTranslation(-8, -8, -8));
           try {
             for (const part of parts2) {
-              const object3 = new EntityObject(part.model, { flip: false, wireframe: this.options.wireframe });
+              const object3 = new EntityObject(part.model, { flip: false, wireframe: this.options.wireframe, tints: part.tints });
               object3.matrix.copy(transform).multiply(part.transform);
               object3.matrixWorldNeedsUpdate = true;
               object3.matrixAutoUpdate = false;
@@ -6385,6 +6539,7 @@ function shutdown() {
 init_AssetKey();
 init_AssetLoader();
 init_Assets();
+init_BannerPatterns();
 
 // src/assets/BlockEntities.ts
 init_AssetKey();
@@ -16797,6 +16952,7 @@ export {
   Axis,
   BUILTIN_ENTITY,
   BUILTIN_GENERATED,
+  BannerPatterns,
   BasicAssetKey,
   BatchedExecutor,
   BlockEntities,
@@ -16821,6 +16977,7 @@ export {
   DEFAULT_ROOT,
   DEFAULT_UV,
   DISPLAY_POSITIONS,
+  DYE_COLORS,
   DefaultBlockStates,
   DisplayPosition,
   DisplayTransforms,