mc-assets 0.2.38 → 0.2.40

package/README.MD

@@ -28,7 +28,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): 5.15 MB.
+All blockstates + models + all atlas textures for all versions bundled with rsbuild (uncompressed): 5.12 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, 1.21.1, 1.21.2, 1.21.3, 1.21.4.
 

package/dist/assetsParser.d.ts

@@ -22,6 +22,7 @@ export declare class AssetsParser {
     matchedModels: string[];
     matchedConditions: string[];
     private getModelsByBlock;
+    private getModelData;
     getResolvedModelsByModel(model: string, debugQueryName?: string, clearModel?: boolean): {
         resolvedModel: Pick<BlockModel, "textures" | "ao" | "elements"> & {
             x?: number;

package/dist/assetsParser.js

@@ -171,11 +171,15 @@ export class AssetsParser {
         }
         return modelsResolved; // todo figure out the type error
     }
+    getModelData(model) {
+        const modelData = this.blockModelsStore.get(this.version, model);
+        return modelData && typeof modelData === 'object' ? structuredClone(modelData) : modelData;
+    }
     getResolvedModelsByModel(model, debugQueryName, clearModel = true) {
         if (clearModel) {
             this.resolvedModel = {};
         }
-        const modelData = this.blockModelsStore.get(this.version, model);
+        const modelData = this.getModelData(model);
         if (!modelData) {
             this.issues.push(`Model ${model} not found. Ensure it is present in assets/${getNamespace(model)}/models/${model}.json`);
             return;
@@ -191,7 +195,7 @@ export class AssetsParser {
         const collectModels = (model) => {
             collectedParentModels.push(model);
             if (model.parent) {
-                const parent = this.blockModelsStore.get(this.version, model.parent);
+                const parent = this.getModelData(model.parent);
                 if (!parent) {
                     this.issues.push(`Parent model ${model.parent} not found for ${debugQueryName}`);
                     return;
@@ -218,11 +222,16 @@ export class AssetsParser {
                 }
             }
             if (model.elements) {
-                this.resolvedModel.elements = structuredClone(model.elements);
+                this.resolvedModel.elements = model.elements;
             }
             for (const [key, value] of Object.entries(model)) {
                 if (key !== 'elements' && key !== 'textures' && key !== 'parent') {
-                    this.resolvedModel[key] = value;
+                    if (this.resolvedModel[key] && typeof this.resolvedModel[key] === 'object' && value && typeof value === 'object') {
+                        Object.assign(this.resolvedModel[key], value);
+                    }
+                    else {
+                        this.resolvedModel[key] = value;
+                    }
                 }
             }
         }

package/dist/atlasCreator.js

@@ -1,4 +1,4 @@
-import { createAtlas } from 'apl-image-packer';
+import { MaxRectsPacker, PACKING_LOGIC, Rectangle } from 'maxrects-packer';
 export const MAX_CANVAS_SIZE = 16_384;
 function nextPowerOfTwo(n) {
     if (n === 0)
@@ -20,7 +20,7 @@ export const getAtlasSize = (numberOfTiles, tileSize) => {
 };
 export const makeTextureAtlas = ({ input, getLoadedImage, tileSize = 16, getCanvas = (imgSize) => typeof document !== 'undefined' && document.createElement ? document.createElement('canvas') : new globalThis.Canvas(imgSize, imgSize, 'png'), }) => {
     // Pre-calculate all texture dimensions and prepare images
-    const texturesWithDimensions = input.map(keyValue => {
+    const texturesWithDimensions = [...new Set(input)].map(keyValue => {
         const inputData = getLoadedImage(keyValue);
         let img;
         if (inputData.image) {
@@ -53,12 +53,45 @@ export const makeTextureAtlas = ({ input, getLoadedImage, tileSize = 16, getCanv
             renderSourceStartY: inputData.renderSourceStartY ?? 0,
         };
     });
-    // Use apl-image-packer to calculate optimal positions
-    const atlas = createAtlas(texturesWithDimensions.map(tex => ({
-        width: tex.renderWidth,
-        height: tex.renderHeight,
-        data: tex // Store all texture data for later use
-    })));
+    // Use MaxRectsPacker to calculate optimal positions
+    const packer = new MaxRectsPacker(undefined, undefined, 0, {
+        square: true,
+        smart: true,
+        pot: true,
+        logic: PACKING_LOGIC.MAX_AREA,
+    });
+    // Add all textures as rectangles
+    const rectangles = texturesWithDimensions.map(tex => {
+        const rect = new Rectangle(tex.renderWidth, tex.renderHeight);
+        rect.data = tex; // Store texture data for later use
+        return rect;
+    });
+    packer.addArray(rectangles);
+    const firstBin = packer.bins[0];
+    if (!firstBin || !firstBin.rects || !firstBin.rects.length) {
+        throw new Error('Failed to pack textures');
+    }
+    const atlas = {
+        width: firstBin.width,
+        height: firstBin.height,
+        coords: firstBin.rects.map(rect => ({
+            x: rect.x,
+            y: rect.y,
+            img: { data: rect.data }
+        }))
+    };
+    // Check for duplicate keyValues in atlas
+    const seenKeyValues = new Set();
+    for (const coord of atlas.coords) {
+        const tex = coord.img.data;
+        if (seenKeyValues.has(tex.keyValue)) {
+            throw new Error(`Duplicate texture keyValue found in atlas: ${tex.keyValue}`);
+        }
+        seenKeyValues.add(tex.keyValue);
+    }
+    if (seenKeyValues.size !== input.length) {
+        throw new Error(`Lost some textures in packing: ${input.length - seenKeyValues.size}`);
+    }
     // Round up atlas size to power of 2
     const imgSize = Math.max(nextPowerOfTwo(atlas.width), nextPowerOfTwo(atlas.height));
     if (imgSize > MAX_CANVAS_SIZE) {