mc-assets 0.2.24 → 0.2.25

package/dist/atlasParser.d.ts

@@ -43,7 +43,7 @@ export declare class AtlasParser {
         imageType: "latest" | "legacy";
         version: string;
     } | undefined;
-    makeNewAtlas(version: string, getCustomImage?: (itemName: string) => DataUrl | HTMLImageElement | boolean | void, tileSize?: number): Promise<{
+    makeNewAtlas(version: string, getCustomImage?: (itemName: string) => DataUrl | HTMLImageElement | boolean | void, _unusedTileSize?: number, getTextureSortRankOrTopTextures?: string[] | ((key: string) => number), addTextures?: string[]): Promise<{
         canvas: HTMLCanvasElement;
         atlas: import("./atlasCreator").JsonAtlas;
         readonly newAtlasParser: AtlasParser;

package/dist/atlasParser.js

@@ -45,12 +45,12 @@ export class AtlasParser {
             }
         };
     }
-    async makeNewAtlas(version, getCustomImage, tileSize = this.atlas.latest.tileSize) {
+    async makeNewAtlas(version, getCustomImage, _unusedTileSize = this.atlas.latest.tileSize, getTextureSortRankOrTopTextures, addTextures = []) {
         const itemsAtlases = this.atlasJson;
         const newTextures = {};
         const legacyImg = this.atlasHasLegacyImage ? await getLoadedImage(this.legacyImage) : null;
         const latestImg = await getLoadedImage(this.latestImage);
-        for (const [itemName, texture] of Object.entries(itemsAtlases.latest.textures)) {
+        for (const itemName of new Set([...Object.keys(itemsAtlases.latest.textures), ...addTextures])) {
             const customImage = getCustomImage?.(itemName);
             if (customImage === false)
                 continue;
@@ -67,7 +67,7 @@ export class AtlasParser {
             }
             const info = this.getTextureInfo(itemName, version);
             if (!info)
-                throw new Error(`Missing texture info for ${itemName}`);
+                throw new Error(`Missing texture info from the provided atlas for ${itemName} and not custom data is provided`);
             const { u, v, su, sv } = info;
             const atlas = info.version === 'latest' ? itemsAtlases.latest : itemsAtlases.legacy;
             const image = info.imageType === 'latest' ? latestImg : legacyImg;
@@ -81,8 +81,13 @@ export class AtlasParser {
                 img: image
             };
         }
+        const newTexturesKeys = Object.keys(newTextures);
+        if (getTextureSortRankOrTopTextures) {
+            const getRankFn = typeof getTextureSortRankOrTopTextures === 'function' ? getTextureSortRankOrTopTextures : (key) => getTextureSortRankOrTopTextures.includes(key) ? 1 : -1;
+            newTexturesKeys.sort((a, b) => getRankFn(b) - getRankFn(a));
+        }
         const { json, canvas } = makeTextureAtlas({
-            input: Object.keys(newTextures),
+            input: newTexturesKeys,
             getLoadedImage: (name) => {
                 const texture = newTextures[name];
                 const image = texture.img;

package/dist/worldBlockProvider.d.ts

@@ -32,7 +32,7 @@ export default function worldBlockProvider(blockstatesModels: any, blocksAtlas:
                 angle: number;
                 rescale?: boolean;
             };
-        }[] | undefined;
+        }[];
     }[][];
     getTextureInfo(textureName: string): {
         su: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mc-assets",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "author": "Vitaly Turovsky <vital2580@icloud.com>",
   "license": "MIT",
   "files": [