mc-assets 0.1.0 → 0.1.2

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export * from './stores';
 export { AtlasParser } from './atlasParser';
 export { makeTextureAtlas, JsonAtlas } from './atlasCreator';
 export * from './types';
-export { AssetsParser, BlockElement, QueriedBlock } from './parser';
+export { AssetsParser, BlockElement, QueriedBlock } from './assetsParser';

package/dist/index.js

@@ -2,4 +2,4 @@ export * from './stores';
 export { AtlasParser } from './atlasParser';
 export { makeTextureAtlas } from './atlasCreator';
 export * from './types';
-export { AssetsParser } from './parser';
+export { AssetsParser } from './assetsParser';

package/dist/itemsRenderer.d.ts

@@ -0,0 +1,63 @@
+import { AtlasParser } from './atlasParser';
+import { AssetsParser } from './assetsParser';
+import { BlockModelsStore, BlockStatesStore } from './stores';
+export declare class ItemsRenderer {
+    version: string;
+    itemsAtlasParser: AtlasParser;
+    blocksAtlasParser?: AtlasParser | undefined;
+    blockStatesStore: BlockStatesStore;
+    modelsStore: BlockModelsStore;
+    assetsParser: AssetsParser;
+    constructor(version: string, blockstatesModels: any, itemsAtlasParser: AtlasParser, blocksAtlasParser?: AtlasParser | undefined);
+    resolveTexture(texture: string): {
+        slice: [number, number, number, number];
+        /** @deprecated */
+        path: string;
+        type: string;
+    };
+    tryGetFullBlock(blockName: string, properties?: Record<string, string | boolean>): {
+        top: {
+            slice: [number, number, number, number];
+            /** @deprecated */
+            path: string;
+            type: string;
+        };
+        left: {
+            slice: [number, number, number, number];
+            /** @deprecated */
+            path: string;
+            type: string;
+        };
+        right: {
+            slice: [number, number, number, number];
+            /** @deprecated */
+            path: string;
+            type: string;
+        };
+    } | undefined;
+    getItemTexture(itemName: string, properties?: Record<string, string | boolean>): {
+        slice: [number, number, number, number];
+        /** @deprecated */
+        path: string;
+        type: string;
+    } | {
+        top: {
+            slice: [number, number, number, number];
+            /** @deprecated */
+            path: string;
+            type: string;
+        };
+        left: {
+            slice: [number, number, number, number];
+            /** @deprecated */
+            path: string;
+            type: string;
+        };
+        right: {
+            slice: [number, number, number, number];
+            /** @deprecated */
+            path: string;
+            type: string;
+        };
+    } | undefined;
+}

package/dist/itemsRenderer.js

@@ -0,0 +1,78 @@
+import { AssetsParser } from './assetsParser';
+import { getLoadedBlockstatesStore, getLoadedModelsStore } from './stores';
+export class ItemsRenderer {
+    version;
+    itemsAtlasParser;
+    blocksAtlasParser;
+    blockStatesStore;
+    modelsStore;
+    assetsParser;
+    constructor(version, blockstatesModels, itemsAtlasParser, blocksAtlasParser) {
+        this.version = version;
+        this.itemsAtlasParser = itemsAtlasParser;
+        this.blocksAtlasParser = blocksAtlasParser;
+        this.blockStatesStore = getLoadedBlockstatesStore(blockstatesModels);
+        this.modelsStore = getLoadedModelsStore(blockstatesModels);
+        this.assetsParser = new AssetsParser(version, this.blockStatesStore, this.modelsStore);
+    }
+    resolveTexture(texture) {
+        const atlasParser = texture.startsWith('block/') ? this.blocksAtlasParser : this.itemsAtlasParser;
+        const type = texture.startsWith('block/') ? 'blocks' : 'items';
+        const textureInfo = atlasParser.getTextureInfo(texture.replace('block/', '').replace('item/', ''), this.version);
+        const atlas = atlasParser.atlas[textureInfo.imageType];
+        return {
+            slice: [
+                textureInfo.u * atlas.width,
+                textureInfo.v * atlas.height,
+                textureInfo.su * atlas.width,
+                textureInfo.sv * atlas.height
+            ],
+            /** @deprecated */
+            path: type,
+            type: type
+        };
+    }
+    tryGetFullBlock(blockName, properties = {}) {
+        if (!this.blocksAtlasParser)
+            return;
+        const resolvedModel = this.assetsParser.getResolvedModel({
+            name: blockName,
+            properties,
+        }, true);
+        if (resolvedModel.elements?.length !== 1)
+            return;
+        const elem = resolvedModel.elements[0];
+        if (elem.from[0] !== 0 || elem.from[1] !== 0 || elem.from[2] !== 0)
+            return;
+        if (elem.to[0] !== 16 || elem.to[1] !== 16 || elem.to[2] !== 16)
+            return;
+        const topTexture = elem.faces.up?.texture ?? elem.faces.top?.texture;
+        const leftTexture = elem.faces.east?.texture ?? elem.faces.left?.texture ?? elem.faces.side?.texture;
+        const rightTexture = elem.faces.north?.texture ?? elem.faces.right?.texture ?? elem.faces.side?.texture;
+        return {
+            top: this.resolveTexture(topTexture),
+            left: this.resolveTexture(leftTexture),
+            right: this.resolveTexture(rightTexture),
+        };
+    }
+    getItemTexture(itemName, properties = {}) {
+        let model;
+        if (itemName.includes('/')) {
+            model = this.modelsStore.get(this.version, itemName);
+        }
+        else {
+            model = this.modelsStore.get(this.version, `item/${itemName}`);
+            if (!model || model.parent?.startsWith('block/')) {
+                return this.tryGetFullBlock(itemName, properties);
+            }
+        }
+        if (!model)
+            return;
+        const layer0 = model.textures?.layer0;
+        if (!layer0)
+            return;
+        return this.resolveTexture(layer0);
+        // const {resolvedModel} = this.assetsParser.getResolvedModelByModelName('item/' + itemName, itemName) ?? {}
+        // resolvedModel?.textures['layer0']
+    }
+}

package/dist/types.d.ts

@@ -34,11 +34,19 @@ export type BlockModel = {
     elements?: {
         from: BlockElementPos;
         to: BlockElementPos;
+        rotation?: {
+            origin: [number, number, number];
+            axis: string;
+            angle: number;
+            rescale?: boolean;
+        };
         faces: {
             [name: string]: {
                 texture: string;
                 uv?: number[];
                 cullface?: string;
+                rotation?: number;
+                tintindex?: number;
             };
         };
     }[];

package/dist/worldBlockProvider.d.ts

@@ -1,9 +1,11 @@
-import { QueriedBlock } from './parser';
+import { QueriedBlock } from './assetsParser';
 export default function worldBlockProvider(blockstatesModels: any, blocksAtlas: any, version: string): {
     getResolvedModel0_1(block: Omit<QueriedBlock, "stateId">, fallbackVariant?: boolean): {
+        x?: number;
+        y?: number;
+        z?: number;
+        ao?: boolean;
         elements: {
-            from: import("./types").BlockElementPos;
-            to: import("./types").BlockElementPos;
             faces: {
                 [k: string]: {
                     texture: {
@@ -11,24 +13,33 @@ export default function worldBlockProvider(blockstatesModels: any, blocksAtlas:
                         v: number;
                         su: number;
                         sv: number;
-                        imageName: string;
-                        version: string;
+                        tileIndex: number;
+                        debugName: string;
                     };
-                    cullface: string | undefined;
+                    uv?: number[];
+                    cullface?: string;
+                    rotation?: number;
+                    tintindex?: number;
                 };
             };
+            from: import("./types").BlockElementPos;
+            to: import("./types").BlockElementPos;
+            rotation?: {
+                origin: [number, number, number];
+                axis: string;
+                angle: number;
+                rescale?: boolean;
+            };
         }[] | undefined;
-        ao: boolean | undefined;
-        x: number | undefined;
-        y: number | undefined;
-        z: number | undefined;
     };
     getTextureInfo(textureName: string): {
         su: number;
         sv: number;
+        getLoadedImage: () => Promise<HTMLImageElement>;
         u: number;
         v: number;
-        imageName: string;
+        tileIndex: number;
+        imageType: "latest" | "legacy";
         version: string;
     } | undefined;
 };

package/dist/worldBlockProvider.js

@@ -1,5 +1,5 @@
 import { AtlasParser } from './atlasParser';
-import { AssetsParser } from './parser';
+import { AssetsParser } from './assetsParser';
 import { getLoadedBlockstatesStore, getLoadedModelsStore } from './stores';
 export default function worldBlockProvider(blockstatesModels, blocksAtlas, version) {
     const blockStatesStore = getLoadedBlockstatesStore(blockstatesModels);
@@ -10,15 +10,14 @@ export default function worldBlockProvider(blockstatesModels, blocksAtlas, versi
         getResolvedModel0_1(block, fallbackVariant = false) {
             const model = assetsParser.getResolvedModel(block, fallbackVariant);
             const interestedFaces = ['north', 'east', 'south', 'west', 'up', 'down'];
+            const { elements, textures, ...rest } = model;
             return {
                 // todo validate elements
-                elements: model.elements?.map((elem) => {
+                elements: elements?.map((elem) => {
                     return {
-                        from: elem.from,
-                        to: elem.to,
+                        ...elem,
                         faces: Object.fromEntries(Object.entries(elem.faces).map(([faceName, face]) => {
-                            const texture = model.textures[face.texture.replace('#', '')];
-                            // TODO validate at the validation stage
+                            const texture = face.texture;
                             if (!texture)
                                 throw new Error(`Missing resolved texture ${texture} for face ${faceName} of ${block.name}`);
                             const finalTexture = this.getTextureInfo(texture);
@@ -41,26 +40,24 @@ export default function worldBlockProvider(blockstatesModels, blocksAtlas, versi
                             const su = (uv[2] - uv[0]) / COORDINATE_MAX * finalTexture.su;
                             const sv = (uv[3] - uv[1]) / COORDINATE_MAX * finalTexture.sv;
                             return [faceName, {
+                                    ...face,
                                     texture: {
-                                        ...finalTexture,
                                         u: finalTexture.u + uv[0] / 16 * finalTexture.su,
                                         v: finalTexture.v + uv[1] / 16 * finalTexture.sv,
                                         su,
-                                        sv
+                                        sv,
+                                        tileIndex: finalTexture.tileIndex,
+                                        debugName: texture,
                                     },
-                                    cullface: face.cullface
                                 }];
                         }))
                     };
                 }),
-                ao: model.ao,
-                x: model.x,
-                y: model.y,
-                z: model.z,
+                ...rest
             };
         },
         getTextureInfo(textureName) {
-            return atlasParser.getTextureInfo(version, textureName.replace('block/', ''));
+            return atlasParser.getTextureInfo(textureName.replace('block/', ''), version);
         }
     };
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "mc-assets",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "author": "Vitaly Turovsky <vital2580@icloud.com>",
   "license": "MIT",
   "files": [
-    "dist"
+    "dist",
+    "docs-assets"
   ],
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -31,6 +32,9 @@
       "version": "0.1.0"
     }
   },
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "keywords": [
     "minecraft",
     "assets",
@@ -47,13 +51,11 @@
     "minecraft extracter"
   ],
   "repository": "https://github.com/zardoy/mc-assets",
-  "engines": {
-    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-  },
   "scripts": {
-    "build": "tsx src/datapaths-builder.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",
+    "build": "tsx src/datapaths-builder.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",
     "build-consumer": "tsc -p tsconfig.consumer.json",
+    "watch-dist": "tsc -p tsconfig.consumer.json -w",
     "build-web": "cd web-demo/ && pnpm build"
   }
 }

package/dist/itemsProvider.d.ts

@@ -1,6 +0,0 @@
-export declare class ItemsProvider {
-    version: string;
-    itemsModelsLatest: Record<string, string>;
-    constructor(version: string, itemsModelsLatest: Record<string, string>);
-    getItemTexture(itemName: string): void;
-}

package/dist/itemsProvider.js

@@ -1,12 +0,0 @@
-// todo
-export class ItemsProvider {
-    version;
-    itemsModelsLatest;
-    constructor(version, itemsModelsLatest) {
-        this.version = version;
-        this.itemsModelsLatest = itemsModelsLatest;
-    }
-    getItemTexture(itemName) {
-        // return this.itemsAtlases[this.version][itemName]
-    }
-}