mc-assets 0.2.34 → 0.2.36

package/dist/worldBlockProvider.d.ts

@@ -1,7 +1,7 @@
 import { QueriedBlock } from './assetsParser';
 import { BlockModel } from './types';
 export default function worldBlockProvider(blockstatesModels: any, blocksAtlas: any, version: string): {
-    getAllResolvedModels0_1(block: Omit<QueriedBlock, "stateId">, fallbackVariant?: boolean): ({
+    getAllResolvedModels0_1(block: Omit<QueriedBlock, "stateId">, fallbackVariant?: boolean, possibleIssues?: string[], matchedModels?: string[], matchedConditions?: string[]): ({
         elements: {
             faces: {
                 [k: string]: {

package/dist/worldBlockProvider.js

@@ -57,15 +57,50 @@ export default function worldBlockProvider(blockstatesModels, blocksAtlas, versi
         };
     };
     return {
-        getAllResolvedModels0_1(block, fallbackVariant = false) {
+        getAllResolvedModels0_1(block, fallbackVariant = false, possibleIssues = [], matchedModels = [], matchedConditions = []) {
+            assetsParser.issues = [];
+            assetsParser.matchedModels = [];
+            assetsParser.matchedConditions = [];
             const modelsParts = assetsParser.getAllResolvedModels(block, fallbackVariant) ?? [];
+            possibleIssues.push(...assetsParser.issues);
+            matchedModels.push(...assetsParser.matchedModels);
+            matchedConditions.push(...assetsParser.matchedConditions);
+            if (!modelsParts.length) {
+                possibleIssues.push(`No models found for block ${block.name}`);
+                return [];
+            }
             const interestedFaces = ['north', 'east', 'south', 'west', 'up', 'down'];
-            return modelsParts.map(modelVariants => {
-                return modelVariants.map(model => {
-                    return transformModel(model, block);
-                }).filter(a => a.elements?.length);
-            }).filter(a => a.length);
+            try {
+                const result = modelsParts.map(modelVariants => {
+                    return modelVariants.map(model => {
+                        try {
+                            return transformModel(model, block);
+                        }
+                        catch (e) {
+                            possibleIssues.push(`Error transforming model for ${block.name}: ${e.message}`);
+                            return null;
+                        }
+                    }).filter(a => a?.elements?.length);
+                }).filter(a => a.length);
+                if (!result.length) {
+                    possibleIssues.push(`No valid models after transformation for block ${block.name}`);
+                }
+                return result;
+            }
+            catch (e) {
+                possibleIssues.push(`Fatal error processing models for ${block.name}: ${e.message}`);
+                return [];
+            }
         },
+        // getResolvedModels0_1(block: Omit<QueriedBlock, 'stateId'>, fallbackVariant = false) {
+        //     const modelsParts = assetsParser.getAllResolvedModels(block, fallbackVariant) ?? []
+        //     const interestedFaces = ['north', 'east', 'south', 'west', 'up', 'down']
+        //     return modelsParts.map(modelVariants => {
+        //         return modelVariants.map(model => {
+        //             return transformModel(model, block);
+        //         }).filter(a => a.elements?.length)
+        //     }).filter(a => a.length)
+        // },
         transformModel,
         getTextureInfo
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mc-assets",
-  "version": "0.2.34",
+  "version": "0.2.36",
   "author": "Vitaly Turovsky <vital2580@icloud.com>",
   "license": "MIT",
   "files": [
@@ -53,6 +53,7 @@
     "minecraft block entity"
   ],
   "dependencies": {
+    "apl-image-packer": "^1.1.0",
     "zod": "^3.24.1"
   },
   "repository": "https://github.com/zardoy/mc-assets",