mc-assets 0.2.6 → 0.2.7

package/dist/assetsParser.js

@@ -153,9 +153,11 @@ export class AssetsParser {
             if (model.textures) {
                 this.resolvedModel.textures ??= {};
                 for (let [key, value] of Object.entries(model.textures)) {
-                    value = value.replace('blocks/', 'block/').replace('block/', '');
-                    if (value.startsWith('#') && this.resolvedModel.textures[value.slice(1)]) {
-                        value = this.resolvedModel.textures[value.slice(1)];
+                    if (value.includes('#')) {
+                        const key = value.split('/').at(-1).slice(1);
+                        if (this.resolvedModel.textures[key]) {
+                            value = this.resolvedModel.textures[key];
+                        }
                     }
                     this.resolvedModel.textures[key] = value;
                 }

package/dist/itemsRenderer.js

@@ -71,10 +71,13 @@ export class ItemsRenderer {
         }
         if (!model)
             return;
-        const layer0 = model.textures?.layer0;
-        if (!layer0)
+        const texture = itemName.startsWith('block/') ?
+            // first defined block texture
+            Object.values(model.textures ?? {})[0] :
+            model.textures?.layer0; // classic item texture
+        if (!texture)
             return;
-        return this.resolveTexture(layer0);
+        return 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.6",
+  "version": "0.2.7",
   "author": "Vitaly Turovsky <vital2580@icloud.com>",
   "license": "MIT",
   "files": [
@@ -60,6 +60,6 @@
     "regen-blockentities": "rm -f dist/blockStatesModels.json && tsx src/blockEntities.ts && tsx src/newAssetsBuilder.ts && tsx src/genBlocks.ts",
     "build-consumer": "tsc -p tsconfig.consumer.json",
     "watch-dist": "tsc -p tsconfig.consumer.json -w",
-    "build-web": "cd web-demo/ && pnpm build"
+    "build-web": "pnpm --dir web-demo build"
   }
 }