mc-assets 0.1.7 → 0.2.1

package/dist/blocksAtlases.json

@@ -6750,88 +6750,88 @@
                 "v": 0.328125,
                 "tileIndex": 1348
             },
-            "entity/decorated_pot/decorated_pot_base": {
-                "u": 0.078125,
-                "v": 0.328125,
-                "tileIndex": 1349,
-                "su": 0.03125,
-                "sv": 0.03125
-            },
             "entity/decorated_pot/decorated_pot_side": {
-                "u": 0.109375,
+                "u": 0.078125,
                 "v": 0.328125,
-                "tileIndex": 1351
+                "tileIndex": 1349
             },
             "entity/signs/oak": {
-                "u": 0.125,
+                "u": 0.09375,
                 "v": 0.328125,
-                "tileIndex": 1352,
+                "tileIndex": 1350,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/sign": {
-                "u": 0.1875,
+                "u": 0.15625,
                 "v": 0.328125,
-                "tileIndex": 1356,
+                "tileIndex": 1354,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/signs/acacia": {
-                "u": 0.25,
+                "u": 0.21875,
                 "v": 0.328125,
-                "tileIndex": 1360,
+                "tileIndex": 1358,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/signs/birch": {
-                "u": 0.3125,
+                "u": 0.28125,
                 "v": 0.328125,
-                "tileIndex": 1364,
+                "tileIndex": 1362,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/signs/dark_oak": {
-                "u": 0.375,
+                "u": 0.34375,
                 "v": 0.328125,
-                "tileIndex": 1368,
+                "tileIndex": 1366,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/signs/jungle": {
-                "u": 0.4375,
+                "u": 0.40625,
                 "v": 0.328125,
-                "tileIndex": 1372,
+                "tileIndex": 1370,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/signs/spruce": {
-                "u": 0.5,
+                "u": 0.46875,
                 "v": 0.328125,
-                "tileIndex": 1376,
+                "tileIndex": 1374,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/signs/crimson": {
-                "u": 0.5625,
+                "u": 0.53125,
                 "v": 0.328125,
-                "tileIndex": 1380,
+                "tileIndex": 1378,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/signs/warped": {
-                "u": 0.625,
+                "u": 0.59375,
                 "v": 0.328125,
-                "tileIndex": 1384,
+                "tileIndex": 1382,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/signs/mangrove": {
-                "u": 0.6875,
+                "u": 0.65625,
                 "v": 0.328125,
-                "tileIndex": 1388,
+                "tileIndex": 1386,
                 "su": 0.0625,
                 "sv": 0.03125
             },
+            "entity/decorated_pot/decorated_pot_base": {
+                "u": 0.71875,
+                "v": 0.328125,
+                "tileIndex": 1390,
+                "su": 0.03125,
+                "sv": 0.03125
+            },
             "entity/signs/hanging/acacia": {
                 "u": 0.75,
                 "v": 0.328125,
@@ -7049,94 +7049,80 @@
                 "su": 0.0625,
                 "sv": 0.0625
             },
-            "entity/chest/normal_double": {
+            "entity/chest/trapped": {
                 "u": 0.6875,
                 "v": 0.421875,
                 "tileIndex": 1772,
-                "su": 0.125,
-                "sv": 0.0625
-            },
-            "entity/chest/trapped": {
-                "u": 0.8125,
-                "v": 0.421875,
-                "tileIndex": 1780,
                 "su": 0.0625,
                 "sv": 0.0625
             },
-            "entity/chest/trapped_double": {
-                "u": 0.875,
-                "v": 0.421875,
-                "tileIndex": 1784,
-                "su": 0.125,
-                "sv": 0.0625
-            },
             "entity/banner_base": {
-                "u": 0,
-                "v": 0.484375,
-                "tileIndex": 1984,
+                "u": 0.75,
+                "v": 0.421875,
+                "tileIndex": 1776,
                 "su": 0.0625,
                 "sv": 0.0625
             },
             "entity/creeper/creeper": {
-                "u": 0.0625,
-                "v": 0.484375,
-                "tileIndex": 1988,
+                "u": 0.8125,
+                "v": 0.421875,
+                "tileIndex": 1780,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/enderdragon/dragon": {
-                "u": 0.125,
+                "u": 0,
                 "v": 0.484375,
-                "tileIndex": 1992,
+                "tileIndex": 1984,
                 "su": 0.25,
                 "sv": 0.25
             },
             "entity/shulker/shulker_white": {
-                "u": 0.375,
+                "u": 0.25,
                 "v": 0.484375,
-                "tileIndex": 2008,
+                "tileIndex": 2000,
                 "su": 0.0625,
                 "sv": 0.0625
             },
             "entity/piglin/piglin": {
-                "u": 0.4375,
+                "u": 0.3125,
                 "v": 0.484375,
-                "tileIndex": 2012,
+                "tileIndex": 2004,
                 "su": 0.0625,
                 "sv": 0.0625
             },
             "entity/player/slim/steve": {
-                "u": 0.5,
+                "u": 0.375,
                 "v": 0.484375,
-                "tileIndex": 2016,
+                "tileIndex": 2008,
                 "su": 0.0625,
                 "sv": 0.0625
             },
             "entity/shulker/shulker": {
-                "u": 0.5625,
+                "u": 0.4375,
                 "v": 0.484375,
-                "tileIndex": 2020,
+                "tileIndex": 2012,
                 "su": 0.0625,
                 "sv": 0.0625
             },
             "entity/skeleton/skeleton": {
-                "u": 0.625,
+                "u": 0.5,
                 "v": 0.484375,
-                "tileIndex": 2024,
+                "tileIndex": 2016,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/skeleton/wither_skeleton": {
-                "u": 0.6875,
+                "u": 0.5625,
                 "v": 0.484375,
-                "tileIndex": 2028,
+                "tileIndex": 2020,
                 "su": 0.0625,
                 "sv": 0.03125
             },
             "entity/zombie/zombie": {
-                "u": 0.75,
+                "u": 0.625,
                 "v": 0.484375,
-                "tileIndex": 2032,
+                "tileIndex": 2024,
                 "su": 0.0625,
                 "sv": 0.0625
             }

package/dist/itemsRenderer.js

@@ -35,11 +35,12 @@ export class ItemsRenderer {
     tryGetFullBlock(blockName, properties = {}) {
         if (!this.blocksAtlasParser)
             return;
-        const resolvedModel = this.assetsParser.getResolvedModel({
+        const resolvedModelParts = this.assetsParser.getResolvedModelFirst({
             name: blockName,
             properties,
         }, true);
-        if (resolvedModel.elements?.length !== 1)
+        const resolvedModel = resolvedModelParts?.[0];
+        if (resolvedModel?.elements?.length !== 1)
             return;
         const elem = resolvedModel.elements[0];
         if (elem.from[0] !== 0 || elem.from[1] !== 0 || elem.from[2] !== 0)

package/dist/types.d.ts

@@ -1,8 +1,11 @@
 type ModelBasic = {
     model: string;
     x?: number;
+    z?: number;
     y?: number;
     uvlock?: boolean;
+    /** only for array models */
+    weight?: number;
 };
 export type BlockApplyModel = ModelBasic | (ModelBasic & {
     weight: any;
@@ -51,9 +54,6 @@ export type BlockModel = {
         };
     }[];
     ambientocclusion?: boolean;
-    x?: number;
-    y?: number;
-    z?: number;
     ao?: boolean;
 };
 type DisplayPresentation = {

package/dist/worldBlockProvider.d.ts

@@ -1,10 +1,12 @@
 import { QueriedBlock } from './assetsParser';
 export default function worldBlockProvider(blockstatesModels: any, blocksAtlas: any, version: string): {
-    getResolvedModel0_1(block: Omit<QueriedBlock, "stateId">, fallbackVariant?: boolean): {
+    getAllResolvedModels0_1(block: Omit<QueriedBlock, "stateId">, fallbackVariant?: boolean): {
+        ao?: boolean;
         x?: number;
         y?: number;
         z?: number;
-        ao?: boolean;
+        uvlock?: boolean;
+        weight?: number;
         elements: {
             faces: {
                 [k: string]: {
@@ -31,7 +33,7 @@ export default function worldBlockProvider(blockstatesModels: any, blocksAtlas:
                 rescale?: boolean;
             };
         }[] | undefined;
-    };
+    }[][];
     getTextureInfo(textureName: string): {
         su: number;
         sv: number;

package/dist/worldBlockProvider.js

@@ -7,54 +7,58 @@ export default function worldBlockProvider(blockstatesModels, blocksAtlas, versi
     const assetsParser = new AssetsParser(version, blockStatesStore, blockModelsStore);
     const atlasParser = new AtlasParser(blocksAtlas, 'latest', 'legacy');
     return {
-        getResolvedModel0_1(block, fallbackVariant = false) {
-            const model = assetsParser.getResolvedModel(block, fallbackVariant);
+        getAllResolvedModels0_1(block, fallbackVariant = false) {
+            const modelsParts = assetsParser.getAllResolvedModels(block, fallbackVariant) ?? [];
             const interestedFaces = ['north', 'east', 'south', 'west', 'up', 'down'];
-            const { elements, textures, ...rest } = model;
-            return {
-                // todo validate elements
-                elements: elements?.map((elem) => {
+            return modelsParts.map(modelVariants => {
+                return modelVariants.map(model => {
+                    const { elements, textures, ...rest } = model;
                     return {
-                        ...elem,
-                        faces: Object.fromEntries(Object.entries(elem.faces).map(([faceName, face]) => {
-                            const texture = face.texture;
-                            if (!texture)
-                                throw new Error(`Missing resolved texture ${texture} for face ${faceName} of ${block.name}`);
-                            const finalTexture = this.getTextureInfo(texture);
-                            if (!finalTexture)
-                                throw new Error(`Missing texture data ${texture} for ${block.name}`);
-                            const _from = elem.from;
-                            const _to = elem.to;
-                            // taken from https://github.com/DragonDev1906/Minecraft-Overviewer/
-                            const COORDINATE_MAX = 16;
-                            const uv = (face.uv || {
-                                // default UVs
-                                // format: [u1, v1, u2, v2] (u = x, v = y)
-                                north: [_to[0], COORDINATE_MAX - _to[1], _from[0], COORDINATE_MAX - _from[1]],
-                                east: [_from[2], COORDINATE_MAX - _to[1], _to[2], COORDINATE_MAX - _from[1]],
-                                south: [_from[0], COORDINATE_MAX - _to[1], _to[0], COORDINATE_MAX - _from[1]],
-                                west: [_from[2], COORDINATE_MAX - _to[1], _to[2], COORDINATE_MAX - _from[1]],
-                                up: [_from[0], _from[2], _to[0], _to[2]],
-                                down: [_to[0], _from[2], _from[0], _to[2]]
-                            }[faceName]);
-                            const su = (uv[2] - uv[0]) / COORDINATE_MAX * finalTexture.su;
-                            const sv = (uv[3] - uv[1]) / COORDINATE_MAX * finalTexture.sv;
-                            return [faceName, {
-                                    ...face,
-                                    texture: {
-                                        u: finalTexture.u + uv[0] / 16 * finalTexture.su,
-                                        v: finalTexture.v + uv[1] / 16 * finalTexture.sv,
-                                        su,
-                                        sv,
-                                        tileIndex: finalTexture.tileIndex,
-                                        debugName: texture,
-                                    },
-                                }];
-                        }))
+                        // todo validate elements
+                        elements: elements?.map((elem) => {
+                            return {
+                                ...elem,
+                                faces: Object.fromEntries(Object.entries(elem.faces).map(([faceName, face]) => {
+                                    const texture = face.texture;
+                                    if (!texture)
+                                        throw new Error(`Missing resolved texture ${texture} for face ${faceName} of ${block.name}`);
+                                    const finalTexture = this.getTextureInfo(texture);
+                                    if (!finalTexture)
+                                        throw new Error(`Missing texture data ${texture} for ${block.name}`);
+                                    const _from = elem.from;
+                                    const _to = elem.to;
+                                    // taken from https://github.com/DragonDev1906/Minecraft-Overviewer/
+                                    const COORDINATE_MAX = 16;
+                                    const uv = (face.uv || {
+                                        // default UVs
+                                        // format: [u1, v1, u2, v2] (u = x, v = y)
+                                        north: [_to[0], COORDINATE_MAX - _to[1], _from[0], COORDINATE_MAX - _from[1]],
+                                        east: [_from[2], COORDINATE_MAX - _to[1], _to[2], COORDINATE_MAX - _from[1]],
+                                        south: [_from[0], COORDINATE_MAX - _to[1], _to[0], COORDINATE_MAX - _from[1]],
+                                        west: [_from[2], COORDINATE_MAX - _to[1], _to[2], COORDINATE_MAX - _from[1]],
+                                        up: [_from[0], _from[2], _to[0], _to[2]],
+                                        down: [_to[0], _from[2], _from[0], _to[2]]
+                                    }[faceName]);
+                                    const su = (uv[2] - uv[0]) / COORDINATE_MAX * finalTexture.su;
+                                    const sv = (uv[3] - uv[1]) / COORDINATE_MAX * finalTexture.sv;
+                                    return [faceName, {
+                                            ...face,
+                                            texture: {
+                                                u: finalTexture.u + uv[0] / 16 * finalTexture.su,
+                                                v: finalTexture.v + uv[1] / 16 * finalTexture.sv,
+                                                su,
+                                                sv,
+                                                tileIndex: finalTexture.tileIndex,
+                                                debugName: texture,
+                                            },
+                                        }];
+                                }))
+                            };
+                        }),
+                        ...rest
                     };
-                }),
-                ...rest
-            };
+                });
+            });
         },
         getTextureInfo(textureName) {
             return atlasParser.getTextureInfo(textureName.replace('block/', ''), version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mc-assets",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "author": "Vitaly Turovsky <vital2580@icloud.com>",
   "license": "MIT",
   "files": [
@@ -48,13 +48,15 @@
     "minecraft items",
     "minecraft colors",
     "minecraft parser",
-    "minecraft extracter"
+    "minecraft extracter",
+    "minecraft block model parser",
+    "minecraft block entity"
   ],
   "repository": "https://github.com/zardoy/mc-assets",
   "scripts": {
     "build": "tsx src/datapaths-builder.ts && tsx src/blockEntities.ts && tsx src/newAssetsBuilder.ts && tsx src/genItems.ts && tsx src/genParticles.ts && tsx src/genBlocks.ts && tsx src/copyOtherTextures.ts && tsx src/compressImages.ts && pnpm type-check && pnpm build-consumer && pnpm build-web && tsx src/buildEndChecks.ts && tsx src/changeReadme.ts",
     "type-check": "tsc --noEmit",
-    "regen-blockentities": "tsx src/blockEntities.ts && tsx src/newAssetsBuilder.ts && tsx src/genBlocks.ts",
+    "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"