mc-assets 0.2.5 → 0.2.7

package/README.MD

@@ -27,7 +27,7 @@ For contributing & building instructions see [building](#building) section.
 > Tested on Node.js 18 and above.
 
 
-All blockstates + models + all atlas textures for all versions bundled with rsbuild (uncompressed): 4.72 MB.
+All blockstates + models + all atlas textures for all versions bundled with rsbuild (uncompressed): 4.83 MB.
 
 This packages includes versions for: 1.7.10, 1.8, 1.8.1, 1.8.2, 1.8.3, 1.8.4, 1.8.5, 1.8.6, 1.8.7, 1.8.8, 1.8.9, 1.9, 1.9.1, 1.9.2, 1.9.3, 1.9.4, 1.10, 1.10.1, 1.10.2, 1.11, 1.11.1, 1.11.2, 1.12, 1.12.1, 1.12.2, 1.13, 1.13.1, 1.13.2, 1.14, 1.14.1, 1.14.2, 1.14.3, 1.14.4, 1.15, 1.15.1, 1.15.2, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5, 1.17, 1.17.1, 1.18, 1.18.1, 1.18.2, 1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4, 1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6, 1.21.
 

package/dist/assetsParser.js

@@ -55,6 +55,9 @@ export class AssetsParser {
             if (properties.OR) {
                 return properties.OR.some((or) => matchProperties(block, or));
             }
+            if (properties.AND) {
+                return properties.AND.every((and) => matchProperties(block, and));
+            }
             for (const prop in properties) {
                 if (typeof properties[prop] !== 'string')
                     properties[prop] = String(properties[prop]);
@@ -149,7 +152,15 @@ export class AssetsParser {
             }
             if (model.textures) {
                 this.resolvedModel.textures ??= {};
-                Object.assign(this.resolvedModel.textures, model.textures);
+                for (let [key, value] of Object.entries(model.textures)) {
+                    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;
+                }
             }
             if (model.elements) {
                 this.resolvedModel.elements ??= [];