@minecraft/creator-tools 0.10.0 → 0.10.1

package/app/IProjectItemData.js

@@ -66,7 +66,7 @@ var ProjectItemType;
     ProjectItemType[ProjectItemType["tradingBehaviorJson"] = 45] = "tradingBehaviorJson";
     ProjectItemType[ProjectItemType["volumeBehaviorJson"] = 46] = "volumeBehaviorJson";
     ProjectItemType[ProjectItemType["attachableResourceJson"] = 47] = "attachableResourceJson";
-    ProjectItemType[ProjectItemType["itemTypeResourceJson"] = 48] = "itemTypeResourceJson";
+    ProjectItemType[ProjectItemType["itemTypeLegacyResource"] = 48] = "itemTypeLegacyResource";
     ProjectItemType[ProjectItemType["materialsResourceJson"] = 49] = "materialsResourceJson";
     ProjectItemType[ProjectItemType["musicDefinitionJson"] = 50] = "musicDefinitionJson";
     ProjectItemType[ProjectItemType["soundDefinitionCatalog"] = 51] = "soundDefinitionCatalog";

package/app/Project.js

@@ -1815,7 +1815,7 @@ class Project {
                                 newJsonType = IProjectItemData_1.ProjectItemType.textureSetJson;
                             }
                             else if (isResourcePack && folderPathLower.indexOf("/items/") >= 0) {
-                                newJsonType = IProjectItemData_1.ProjectItemType.itemTypeResourceJson;
+                                newJsonType = IProjectItemData_1.ProjectItemType.itemTypeLegacyResource;
                             }
                             else if (isResourcePack && baseName === "sounds") {
                                 newJsonType = IProjectItemData_1.ProjectItemType.soundCatalog;

package/app/ProjectItemRelations.js

@@ -5,6 +5,7 @@ const BlockTypeDefinition_1 = require("../minecraft/BlockTypeDefinition");
 const EntityTypeDefinition_1 = require("../minecraft/EntityTypeDefinition");
 const EntityTypeResourceDefinition_1 = require("../minecraft/EntityTypeResourceDefinition");
 const ItemTextureCatalogDefinition_1 = require("../minecraft/ItemTextureCatalogDefinition");
+const ItemTypeDefinition_1 = require("../minecraft/ItemTypeDefinition");
 const JsonUIResourceDefinition_1 = require("../minecraft/JsonUIResourceDefinition");
 const MusicDefinitionCatalogDefinition_1 = require("../minecraft/MusicDefinitionCatalogDefinition");
 const ParticleEffectResourceDefinition_1 = require("../minecraft/ParticleEffectResourceDefinition");
@@ -30,6 +31,15 @@ class ProjectItemRelations {
                     }
                 }
             }
+            else if (item.itemType === IProjectItemData_1.ProjectItemType.itemTypeBehavior) {
+                await item.ensureStorage();
+                if (item.defaultFile) {
+                    const itemTypeBehavior = await ItemTypeDefinition_1.default.ensureOnFile(item.defaultFile);
+                    if (itemTypeBehavior) {
+                        await itemTypeBehavior.addChildItems(project, item);
+                    }
+                }
+            }
             else if (item.itemType === IProjectItemData_1.ProjectItemType.blockTypeBehavior) {
                 await item.ensureStorage();
                 if (item.defaultFile) {

package/app/ProjectItemUtilities.js

@@ -130,7 +130,7 @@ class ProjectItemUtilities {
                 return "behavior/trading/trading.json";
             case IProjectItemData_1.ProjectItemType.attachableResourceJson:
                 return "resource/attachables/attachables.json";
-            case IProjectItemData_1.ProjectItemType.itemTypeResourceJson:
+            case IProjectItemData_1.ProjectItemType.itemTypeLegacyResource:
                 return "resource/items/items.json";
             case IProjectItemData_1.ProjectItemType.materialsResourceJson:
                 return "resource/materials/materials.json";
@@ -339,7 +339,7 @@ class ProjectItemUtilities {
             case IProjectItemData_1.ProjectItemType.dialogueBehaviorJson:
             case IProjectItemData_1.ProjectItemType.MCWorld:
             case IProjectItemData_1.ProjectItemType.worldTemplateManifestJson:
-            case IProjectItemData_1.ProjectItemType.itemTypeResourceJson:
+            case IProjectItemData_1.ProjectItemType.itemTypeLegacyResource:
             case IProjectItemData_1.ProjectItemType.featureBehavior:
             case IProjectItemData_1.ProjectItemType.featureRuleBehaviorJson:
                 return IProjectItemData_1.ProjectItemCategory.types;
@@ -467,7 +467,7 @@ class ProjectItemUtilities {
             case IProjectItemData_1.ProjectItemType.tradingBehaviorJson:
             case IProjectItemData_1.ProjectItemType.volumeBehaviorJson:
             case IProjectItemData_1.ProjectItemType.attachableResourceJson:
-            case IProjectItemData_1.ProjectItemType.itemTypeResourceJson:
+            case IProjectItemData_1.ProjectItemType.itemTypeLegacyResource:
             case IProjectItemData_1.ProjectItemType.materialsResourceJson:
             case IProjectItemData_1.ProjectItemType.musicDefinitionJson:
             case IProjectItemData_1.ProjectItemType.soundDefinitionCatalog:
@@ -683,7 +683,7 @@ class ProjectItemUtilities {
                 return "Volume";
             case IProjectItemData_1.ProjectItemType.attachableResourceJson:
                 return "Attachable";
-            case IProjectItemData_1.ProjectItemType.itemTypeResourceJson:
+            case IProjectItemData_1.ProjectItemType.itemTypeLegacyResource:
                 return "Item type resources";
             case IProjectItemData_1.ProjectItemType.materialsResourceJson:
                 return "Materials";
@@ -895,7 +895,7 @@ class ProjectItemUtilities {
         return (type === IProjectItemData_1.ProjectItemType.itemTextureJson ||
             type === IProjectItemData_1.ProjectItemType.itemTypeBehavior ||
             type === IProjectItemData_1.ProjectItemType.attachableResourceJson ||
-            type === IProjectItemData_1.ProjectItemType.itemTypeResourceJson);
+            type === IProjectItemData_1.ProjectItemType.itemTypeLegacyResource);
     }
     static isItemRelated(projectItem, dontGoUpward, dontGoDownward) {
         if (projectItem.parentItems && !dontGoUpward) {
@@ -1027,7 +1027,7 @@ class ProjectItemUtilities {
                 return "TypeScript files";
             case IProjectItemData_1.ProjectItemType.js:
                 return "JavaScript files";
-            case IProjectItemData_1.ProjectItemType.itemTypeResourceJson:
+            case IProjectItemData_1.ProjectItemType.itemTypeLegacyResource:
                 return "Item type visuals and audio";
             case IProjectItemData_1.ProjectItemType.entityTypeResource:
                 return "Entity type visuals/audio";
@@ -1137,7 +1137,7 @@ class ProjectItemUtilities {
             case IProjectItemData_1.ProjectItemType.entityTypeBehavior:
                 return ["entities"];
             case IProjectItemData_1.ProjectItemType.itemTypeBehavior:
-            case IProjectItemData_1.ProjectItemType.itemTypeResourceJson:
+            case IProjectItemData_1.ProjectItemType.itemTypeLegacyResource:
                 return ["items"];
             case IProjectItemData_1.ProjectItemType.blockTypeBehavior:
                 return ["blocks"];

package/cli/index.js

@@ -834,50 +834,52 @@ async function validate() {
     for (let i = 0; i < projectStarts.length; i++) {
         const ps = projectStarts[i];
         pool.queue(async (doTask) => {
-            const result = await doTask({
-                task: ClUtils_js_1.TaskType.validate,
-                project: ps,
-                arguments: {
-                    suite: suiteConst,
-                    exclusionList: exclusionListConst,
-                    outputMci: aggregateReportsAfterValidationConst || outputType === ClUtils_js_1.OutputType.noReports ? true : false,
-                    outputType: outputType,
-                },
-                outputFolder: options.outputFolder,
-                inputFolder: options.inputFolder,
-                displayInfo: localEnvConst.displayInfo,
-                displayVerbose: localEnvConst.displayVerbose,
-                force: force,
-            });
-            if (result !== undefined) {
-                if (typeof result === "string") {
-                    if (ps) {
-                        Log_js_1.default.error(ps.ctorProjectName + " error: " + result);
-                    }
-                }
-                else {
-                    for (const metaState of result) {
-                        // clear out icons since the aggregation won't need them, and it should save memory.
-                        if (metaState.infoSetData && metaState.infoSetData.info && metaState.infoSetData.info["defaultIcon"]) {
-                            metaState.infoSetData.info["defaultIcon"] = undefined;
+            try {
+                const result = await doTask({
+                    task: ClUtils_js_1.TaskType.validate,
+                    project: ps,
+                    arguments: {
+                        suite: suiteConst,
+                        exclusionList: exclusionListConst,
+                        outputMci: aggregateReportsAfterValidationConst || outputType === ClUtils_js_1.OutputType.noReports ? true : false,
+                        outputType: outputType,
+                    },
+                    outputFolder: options.outputFolder,
+                    inputFolder: options.inputFolder,
+                    displayInfo: localEnvConst.displayInfo,
+                    displayVerbose: localEnvConst.displayVerbose,
+                    force: force,
+                });
+                if (result !== undefined) {
+                    if (typeof result === "string") {
+                        if (ps) {
+                            Log_js_1.default.error(ps.ctorProjectName + " error: " + result);
                         }
-                        projectList.push(metaState);
-                        const infoSet = metaState.infoSetData;
-                        if (infoSet) {
-                            const items = infoSet.items;
-                            if (items) {
-                                for (const item of items) {
-                                    if (item.iTp === IInfoItemData_js_1.InfoItemType.internalProcessingError) {
-                                        console.error("Internal Processing Error: " + ProjectInfoSet_js_1.default.getEffectiveMessageFromData(infoSet, item));
-                                        setErrorLevel(ERROR_VALIDATION_INTERNALPROCESSINGERROR);
-                                    }
-                                    else if (item.iTp === IInfoItemData_js_1.InfoItemType.testCompleteFail && !options.outputFolder) {
-                                        console.error("Test Fail: " + ProjectInfoSet_js_1.default.getEffectiveMessageFromData(infoSet, item));
-                                        setErrorLevel(ERROR_VALIDATION_TESTFAIL);
-                                    }
-                                    else if (item.iTp === IInfoItemData_js_1.InfoItemType.error && !options.outputFolder) {
-                                        console.error("Error: " + ProjectInfoSet_js_1.default.getEffectiveMessageFromData(infoSet, item));
-                                        setErrorLevel(ERROR_VALIDATION_ERROR);
+                    }
+                    else {
+                        for (const metaState of result) {
+                            // clear out icons since the aggregation won't need them, and it should save memory.
+                            if (metaState.infoSetData && metaState.infoSetData.info && metaState.infoSetData.info["defaultIcon"]) {
+                                metaState.infoSetData.info["defaultIcon"] = undefined;
+                            }
+                            projectList.push(metaState);
+                            const infoSet = metaState.infoSetData;
+                            if (infoSet) {
+                                const items = infoSet.items;
+                                if (items) {
+                                    for (const item of items) {
+                                        if (item.iTp === IInfoItemData_js_1.InfoItemType.internalProcessingError) {
+                                            console.error("Internal Processing Error: " + ProjectInfoSet_js_1.default.getEffectiveMessageFromData(infoSet, item));
+                                            setErrorLevel(ERROR_VALIDATION_INTERNALPROCESSINGERROR);
+                                        }
+                                        else if (item.iTp === IInfoItemData_js_1.InfoItemType.testCompleteFail && !options.outputFolder) {
+                                            console.error("Test Fail: " + ProjectInfoSet_js_1.default.getEffectiveMessageFromData(infoSet, item));
+                                            setErrorLevel(ERROR_VALIDATION_TESTFAIL);
+                                        }
+                                        else if (item.iTp === IInfoItemData_js_1.InfoItemType.error && !options.outputFolder) {
+                                            console.error("Error: " + ProjectInfoSet_js_1.default.getEffectiveMessageFromData(infoSet, item));
+                                            setErrorLevel(ERROR_VALIDATION_ERROR);
+                                        }
                                     }
                                 }
                             }
@@ -885,6 +887,10 @@ async function validate() {
                     }
                 }
             }
+            catch (e) {
+                console.error("Internal Processing Error 2: " + e.toString());
+                setErrorLevel(ERROR_VALIDATION_INTERNALPROCESSINGERROR);
+            }
         });
     }
     await pool.settled();

package/core/Constants.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constants = void 0;
 exports.constants = {
-    version: "0.10.0",
+    version: "0.10.1",
     name: "Minecraft Creator Tools",
     disclaimer: "Alpha software. License at https://github.com/mojang/minecraft-creator-tools.",
     copyright: "Copyright 2024 Mojang AB. All rights reserved.",

package/core/Utilities.js

@@ -235,14 +235,28 @@ class Utilities {
         return Utilities.dehumanifyMinecraftName(val);
     }
     static humanify(val, humanify) {
-        if (!humanify || val === undefined) {
+        if (humanify === IField_1.FieldValueHumanify.none || val === undefined) {
             return val;
         }
         if (humanify === IField_1.FieldValueHumanify.general) {
             return Utilities.humanifyObject(val);
         }
         if (typeof val === "object") {
-            return JSON.stringify(val);
+            let simpleStr = "";
+            for (const key in val) {
+                const data = val[key];
+                if (data !== undefined) {
+                    // if the object looks complicated, just stringify it
+                    if (typeof data === "object") {
+                        return JSON.stringify(val);
+                    }
+                    if (simpleStr.length > 0) {
+                        simpleStr += ", ";
+                    }
+                    simpleStr += key + ": " + data.toString();
+                }
+            }
+            return simpleStr;
         }
         if (Array.isArray(val)) {
             return val;