mc-assets 0.2.8 → 0.2.10

package/README.MD

@@ -35,6 +35,8 @@ This packages includes versions for: 1.7.10, 1.8, 1.8.1, 1.8.2, 1.8.3, 1.8.4, 1.
 <summary>Included Block Entities (Additional Block Models) (132):</summary>
 
 - ✅ item_frame
+- ✅ sign
+- ✅ wall_sign
 - ✅ acacia_sign
 - ✅ acacia_wall_sign
 - ✅ birch_sign
@@ -164,28 +166,10 @@ This packages includes versions for: 1.7.10, 1.8, 1.8.1, 1.8.2, 1.8.3, 1.8.4, 1.
 - ✅ yellow_wall_banner
 - ✅ zombie_head
 - ✅ zombie_wall_head
-- ✅ sign
-- ✅ wall_sign
-- ❌ black_glazed_terracotta
-- ❌ blue_glazed_terracotta
-- ❌ brown_glazed_terracotta
-- ❌ cyan_glazed_terracotta
 - ❌ end_gateway
 - ❌ end_portal
-- ❌ gray_glazed_terracotta
-- ❌ green_glazed_terracotta
-- ❌ light_blue_glazed_terracotta
-- ❌ light_gray_glazed_terracotta
-- ❌ lime_glazed_terracotta
-- ❌ magenta_glazed_terracotta
-- ❌ orange_glazed_terracotta
-- ❌ pink_glazed_terracotta
-- ❌ purple_glazed_terracotta
-- ❌ red_glazed_terracotta
 - ❌ structure_void
 - ❌ trial_spawner
-- ❌ white_glazed_terracotta
-- ❌ yellow_glazed_terracotta
 
 </details>
 

package/dist/assetsParser.js

@@ -143,7 +143,19 @@ export class AssetsParser {
         const modelData = this.blockModelsStore.get(this.version, model);
         if (!modelData)
             return;
-        const resolveModel = (model) => {
+        const collectedParentModels = [];
+        const collectModels = (model) => {
+            collectedParentModels.push(model);
+            if (model.parent) {
+                const parent = this.blockModelsStore.get(this.version, model.parent);
+                if (!parent)
+                    return;
+                collectModels(parent);
+            }
+        };
+        collectModels(modelData);
+        collectedParentModels.reverse(); // from parent to child
+        for (const model of collectedParentModels) {
             if (model.ambientocclusion !== undefined) {
                 this.resolvedModel.ao = model.ambientocclusion;
             }
@@ -153,8 +165,10 @@ export class AssetsParser {
             if (model.textures) {
                 this.resolvedModel.textures ??= {};
                 for (let [key, value] of Object.entries(model.textures)) {
-                    if (value.includes('#')) {
-                        const key = value.split('/').at(-1).slice(1);
+                    if (value.includes('#'))
+                        value = value.split('/').at(-1);
+                    if (value.startsWith('#')) {
+                        const key = value.slice(1);
                         if (this.resolvedModel.textures[key]) {
                             value = this.resolvedModel.textures[key];
                         }
@@ -163,38 +177,35 @@ export class AssetsParser {
                 }
             }
             if (model.elements) {
-                this.resolvedModel.elements ??= [];
-                this.resolvedModel.elements.push(...structuredClone(model.elements));
+                this.resolvedModel.elements = structuredClone(model.elements);
             }
-            if (model.parent) {
-                const parent = this.blockModelsStore.get(this.version, model.parent);
-                if (!parent)
-                    return;
-                resolveModel(parent);
-            }
-            return model;
-        };
-        resolveModel(modelData);
-        const resolveTexture = (originalTexturePath, _originalKey) => {
+        }
+        const resolveTexture = (originalTexturePath, _originalKey, chain) => {
+            chain.push(_originalKey);
             if (originalTexturePath.includes('#')) {
                 originalTexturePath = originalTexturePath.split('/').at(-1).replace('#', '');
                 this.resolvedModel.textures ??= {};
+                if (chain.includes(originalTexturePath)) {
+                    console.warn(`${debugQueryName}: Circular texture reference detected: ${chain.join(' -> ')}`);
+                    return;
+                }
                 const existingKey = this.resolvedModel.textures[originalTexturePath];
                 if (!existingKey) {
                     // todo this also needs to be done at the validation stage
                     // throw new Error(`Cannot resolve texture ${key} to ${value} because it is not defined`)
                     console.warn(`${debugQueryName}: Cannot resolve texture ${originalTexturePath} for ${_originalKey} because it is not defined`);
+                    return;
                 }
                 else {
-                    return existingKey;
+                    return resolveTexture(existingKey, originalTexturePath, chain);
                 }
             }
-            return;
+            return originalTexturePath;
         };
         for (let [key, value] of Object.entries(this.resolvedModel.textures ?? {})) {
             if (!value.includes('#'))
                 continue;
-            const resolved = resolveTexture(value, key);
+            const resolved = resolveTexture(value, key, []);
             if (resolved)
                 this.resolvedModel.textures[key] = resolved;
             else