mc-assets 0.2.28 → 0.2.29

package/dist/itemsRenderer.d.ts

@@ -14,7 +14,7 @@ export declare class ItemsRenderer {
         type: string;
         /** @deprecated */
         path: string;
-    };
+    } | undefined;
     tryGetFullBlock(blockName: string, properties?: Record<string, string | boolean>): {
         top: {
             slice: [number, number, number, number];
@@ -35,7 +35,7 @@ export declare class ItemsRenderer {
             path: string;
         };
     } | undefined;
-    getItemTexture(itemName: string, properties?: Record<string, string | boolean>): {
+    getItemTexture(itemNameOrModel: string, properties?: Record<string, string | boolean>, exactItemResolve?: boolean): {
         slice: [number, number, number, number];
         type: string;
         /** @deprecated */

package/dist/itemsRenderer.js

@@ -19,6 +19,8 @@ export class ItemsRenderer {
         const type = texture.includes('items/') ? 'items' : (texture.includes('block/') || texture.includes('blocks/')) ? 'blocks' : 'items';
         const atlasParser = type === 'blocks' ? this.blocksAtlasParser : this.itemsAtlasParser;
         const textureInfo = atlasParser.getTextureInfo(texture.replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', ''), this.version);
+        if (!textureInfo)
+            return;
         const atlas = atlasParser.atlas[textureInfo.imageType];
         return {
             slice: [
@@ -51,32 +53,43 @@ export class ItemsRenderer {
         const rightTexture = elem.faces.north?.texture ?? elem.faces.right?.texture ?? elem.faces.side?.texture;
         if (!topTexture || !leftTexture || !rightTexture)
             return;
+        const topTextureResolved = this.resolveTexture(topTexture);
+        if (!topTextureResolved)
+            throw new Error(`Missing texture for ${blockName} top texture`);
+        const leftTextureResolved = this.resolveTexture(leftTexture);
+        if (!leftTextureResolved)
+            throw new Error(`Missing texture for ${blockName} left texture`);
+        const rightTextureResolved = this.resolveTexture(rightTexture);
+        if (!rightTextureResolved)
+            throw new Error(`Missing texture for ${blockName} right texture`);
         return {
-            top: this.resolveTexture(topTexture),
-            left: this.resolveTexture(leftTexture),
-            right: this.resolveTexture(rightTexture),
+            top: topTextureResolved,
+            left: leftTextureResolved,
+            right: rightTextureResolved,
         };
     }
-    getItemTexture(itemName, properties = {}) {
+    getItemTexture(itemNameOrModel, properties = {}, exactItemResolve = false) {
+        itemNameOrModel = itemNameOrModel.replace(/^minecraft:/, '');
         let model;
-        if (itemName.includes('/')) {
-            model = this.modelsStore.get(this.version, itemName);
+        if (itemNameOrModel.includes('/') || exactItemResolve) {
+            model = this.modelsStore.get(this.version, itemNameOrModel);
         }
         else {
-            model = this.modelsStore.get(this.version, `item/${itemName}`);
+            model = this.modelsStore.get(this.version, `item/${itemNameOrModel}`);
             if (!model || model.parent?.includes('block/')) {
-                return this.tryGetFullBlock(itemName, properties);
+                return this.tryGetFullBlock(itemNameOrModel, properties);
             }
         }
         if (!model)
             return;
-        const texture = itemName.includes('block/') ?
+        const texture = itemNameOrModel.includes('block/') ?
             // first defined block texture
             Object.values(model.textures ?? {})[0] :
             model.textures?.layer0; // classic item texture
         if (!texture)
             return;
-        return this.resolveTexture(texture);
+        return (texture.startsWith('invsprite_') ? this.resolveTexture(texture.replace('invsprite_', '')) : undefined)
+            ?? this.resolveTexture(texture);
         // const {resolvedModel} = this.assetsParser.getResolvedModelByModelName('item/' + itemName, itemName) ?? {}
         // resolvedModel?.textures['layer0']
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mc-assets",
-  "version": "0.2.28",
+  "version": "0.2.29",
   "author": "Vitaly Turovsky <vital2580@icloud.com>",
   "license": "MIT",
   "files": [
@@ -15,7 +15,7 @@
     "@xmcl/core": "^2.13.0",
     "@xmcl/installer": "^5.4.0",
     "@zardoy/tsconfig": "^1.5.1",
-    "canvas": "^2.11.2",
+    "canvas": "^3.1.0",
     "filesize": "^10.1.4",
     "imagemin": "^9.0.0",
     "imagemin-optipng": "^8.0.0",