@minecraft/creator-tools 0.9.0 → 0.9.1

package/NOTICE.md

@@ -143,6 +143,28 @@ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
 OTHER DEALINGS IN THE FONT SOFTWARE.
 
+### obscenity
+
+Copyright (c) 2021 Joe L.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
 ### fontsource
 
 #### MIT License

package/app/IProjectItemData.js

@@ -3,7 +3,7 @@
 // Licensed under the MIT License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectItemCreationType = exports.ProjectItemErrorStatus = exports.ProjectItemEditPreference = exports.ProjectItemStorageType = exports.ProjectItemType = exports.ProjectItemCategory = exports.MaxItemTypes = void 0;
-exports.MaxItemTypes = 129;
+exports.MaxItemTypes = 138;
 var ProjectItemCategory;
 (function (ProjectItemCategory) {
     ProjectItemCategory[ProjectItemCategory["assets"] = 0] = "assets";
@@ -147,6 +147,14 @@ var ProjectItemType;
     ProjectItemType[ProjectItemType["blockCulling"] = 127] = "blockCulling";
     ProjectItemType[ProjectItemType["craftingItemCatalog"] = 128] = "craftingItemCatalog";
     ProjectItemType[ProjectItemType["mcToolsProjectPreferences"] = 129] = "mcToolsProjectPreferences";
+    ProjectItemType[ProjectItemType["educationJson"] = 130] = "educationJson";
+    ProjectItemType[ProjectItemType["aimAssistJson"] = 131] = "aimAssistJson";
+    ProjectItemType[ProjectItemType["colorGradingJson"] = 132] = "colorGradingJson";
+    ProjectItemType[ProjectItemType["atmosphericsJson"] = 133] = "atmosphericsJson";
+    ProjectItemType[ProjectItemType["pbrJson"] = 134] = "pbrJson";
+    ProjectItemType[ProjectItemType["pointLightsJson"] = 135] = "pointLightsJson";
+    ProjectItemType[ProjectItemType["waterJson"] = 136] = "waterJson";
+    ProjectItemType[ProjectItemType["shadowsJson"] = 137] = "shadowsJson";
 })(ProjectItemType = exports.ProjectItemType || (exports.ProjectItemType = {}));
 var ProjectItemStorageType;
 (function (ProjectItemStorageType) {

package/app/Project.js

@@ -1292,6 +1292,9 @@ class Project {
         }
         this.collapsedStoragePaths.push(storagePath);
     }
+    get isVanillaSourceProject() {
+        return this.defaultBehaviorPackUniqueId === "ee649bcf-256c-4013-9068-6a802b89d756";
+    }
     ensureStoragePathIsNotCollapsed(storagePath) {
         const newCollapsedPaths = [];
         for (const pathCollapsed of this.collapsedStoragePaths) {
@@ -1447,12 +1450,14 @@ class Project {
                                     if (manifest.header.uuid !== undefined) {
                                         if (folderContext === FolderContext.behaviorPack) {
                                             this.defaultBehaviorPackUniqueId = manifest.header.uuid;
+                                            this.defaultBehaviorPackVersion = manifest.header.version;
                                             __classPrivateFieldSet(this, _Project_defaultBehaviorPackFolder, folder, "f");
                                             __classPrivateFieldSet(this, _Project_behaviorPacksContainer, parentFolder, "f");
                                             this.ensurePackByFolder(folder, Pack_1.PackType.behavior);
                                         }
                                         else if (folderContext === FolderContext.resourcePack) {
                                             this.defaultResourcePackUniqueId = manifest.header.uuid;
+                                            this.defaultResourcePackVersion = manifest.header.version;
                                             __classPrivateFieldSet(this, _Project_defaultResourcePackFolder, folder, "f");
                                             __classPrivateFieldSet(this, _Project_resourcePacksContainer, parentFolder, "f");
                                             this.ensurePackByFolder(folder, Pack_1.PackType.resource);
@@ -1645,6 +1650,19 @@ class Project {
                                 folderPathLower.indexOf("/spawn_rules/") >= 0) {
                                 newJsonType = IProjectItemData_1.ProjectItemType.spawnRuleBehavior;
                             }
+                            else if (folderContext === FolderContext.behaviorPack &&
+                                folderPathLower.indexOf("/cameras/") >= 0 &&
+                                folderPathLower.indexOf("aim_assist_preset") >= 0) {
+                                newJsonType = IProjectItemData_1.ProjectItemType.aimAssistJson;
+                            }
+                            else if ((folderContext === FolderContext.resourcePack || folderContext === FolderContext.resourcePackSubPack) &&
+                                folderPathLower.indexOf("/atmospherics/") >= 0) {
+                                newJsonType = IProjectItemData_1.ProjectItemType.atmosphericsJson;
+                            }
+                            else if ((folderContext === FolderContext.resourcePack || folderContext === FolderContext.resourcePackSubPack) &&
+                                folderPathLower.indexOf("/color_grading/") >= 0) {
+                                newJsonType = IProjectItemData_1.ProjectItemType.colorGradingJson;
+                            }
                             else if (folderContext === FolderContext.behaviorPack && folderPathLower.indexOf("/cameras/") >= 0) {
                                 newJsonType = IProjectItemData_1.ProjectItemType.cameraJson;
                             }
@@ -1756,6 +1774,22 @@ class Project {
                                 folderPathLower.indexOf("/lighting/") >= 0) {
                                 newJsonType = IProjectItemData_1.ProjectItemType.lightingJson;
                             }
+                            else if ((folderContext === FolderContext.resourcePack || folderContext === FolderContext.resourcePackSubPack) &&
+                                folderPathLower.indexOf("/point_lights/") >= 0) {
+                                newJsonType = IProjectItemData_1.ProjectItemType.lightingJson;
+                            }
+                            else if ((folderContext === FolderContext.resourcePack || folderContext === FolderContext.resourcePackSubPack) &&
+                                folderPathLower.indexOf("/pbr/") >= 0) {
+                                newJsonType = IProjectItemData_1.ProjectItemType.pbrJson;
+                            }
+                            else if ((folderContext === FolderContext.resourcePack || folderContext === FolderContext.resourcePackSubPack) &&
+                                folderPathLower.indexOf("/water/") >= 0) {
+                                newJsonType = IProjectItemData_1.ProjectItemType.waterJson;
+                            }
+                            else if ((folderContext === FolderContext.resourcePack || folderContext === FolderContext.resourcePackSubPack) &&
+                                folderPathLower.indexOf("/shadows/") >= 0) {
+                                newJsonType = IProjectItemData_1.ProjectItemType.shadowsJson;
+                            }
                             else if (folderContext === FolderContext.resourcePack && folderPathLower.indexOf("/ui/") >= 0) {
                                 newJsonType = IProjectItemData_1.ProjectItemType.uiJson;
                             }
@@ -1783,6 +1817,9 @@ class Project {
                             else if (folderContext === FolderContext.resourcePack && baseName === "sounds") {
                                 newJsonType = IProjectItemData_1.ProjectItemType.soundCatalog;
                             }
+                            else if (baseName === "education") {
+                                newJsonType = IProjectItemData_1.ProjectItemType.educationJson;
+                            }
                             else if (baseName === "world_behavior_packs") {
                                 newJsonType = IProjectItemData_1.ProjectItemType.behaviorPackListJson;
                             }
@@ -2069,7 +2106,7 @@ class Project {
                     __classPrivateFieldSet(this, _Project_resourcePacksContainer, parentFolder, "f");
                 }
             }
-            else if (!isWorld && __classPrivateFieldGet(this, _Project_defaultBehaviorPackFolder, "f") === null) {
+            else if (!isWorld && !isResource && __classPrivateFieldGet(this, _Project_defaultBehaviorPackFolder, "f") === null) {
                 __classPrivateFieldSet(this, _Project_defaultBehaviorPackFolder, folder, "f");
                 if (parentFolder !== null) {
                     __classPrivateFieldSet(this, _Project_behaviorPacksContainer, parentFolder, "f");

package/app/ProjectExporter.js

@@ -18,6 +18,7 @@ const CartoApp_1 = require("./CartoApp");
 const HttpStorage_1 = require("../storage/HttpStorage");
 const ProjectBuild_1 = require("./ProjectBuild");
 const WorldLevelDat_1 = require("../minecraft/WorldLevelDat");
+const IProjectItemData_1 = require("./IProjectItemData");
 exports.ProjectImportExclusions = [
     "build",
     "node_modules",
@@ -37,8 +38,9 @@ class ProjectExporter {
             Log_1.default.unexpectedNull();
             return undefined;
         }
-        const mcworld = await this.generateBetaApisWorldWithPacks(project, name, undefined, {
+        const mcworld = await this.generateWorldWithPacksAndContent(project, name, undefined, {
             generator: WorldLevelDat_1.Generator.flat,
+            betaApisExperiment: true,
         });
         if (!mcworld) {
             return undefined;
@@ -427,10 +429,10 @@ class ProjectExporter {
         }
         await mcworld.load(false);
         await mcworld.applyWorldSettings(worldSettings);
+        await ProjectExporter.ensureExperimentsEnabledOnWorld(mcworld, project);
         if (projectBuild) {
             await ProjectExporter.deployProjectPacks(project, projectBuild, targetFolder, mcworld);
         }
-        mcworld.betaApisExperiment = true;
         mcworld.name = project.name;
         await targetFolder.saveAll();
         await mcworld.save();
@@ -540,7 +542,7 @@ class ProjectExporter {
             return;
         }
         const fileName = project.name + " flatpack.mcworld";
-        const name = project.name + " Flat GameTest";
+        const name = project.name + " Flat";
         const mcworld = await ProjectExporter.generateFlatGameTestWorldWithPackRefs(project, name);
         if (mcworld !== undefined) {
             const newBytes = await mcworld.getBytes();
@@ -588,7 +590,7 @@ class ProjectExporter {
             return zipBytes;
         }
     }
-    static async generateBetaApisWorldWithPacks(project, worldName, worldContent, worldSettings) {
+    static async generateWorldWithPacksAndContent(project, worldName, worldContent, worldSettings) {
         await project.ensureLoadedProjectFolder();
         const mcworld = new MCWorld_1.default();
         if (worldContent) {
@@ -606,11 +608,36 @@ class ProjectExporter {
         if (!projectBuild) {
             return undefined;
         }
-        mcworld.betaApisExperiment = true;
+        await this.ensureExperimentsEnabledOnWorld(mcworld, project);
         mcworld.name = worldName;
         await ProjectExporter.deployProjectPacks(project, projectBuild, mcworld.storage.rootFolder, mcworld);
         return mcworld;
     }
+    static async ensureExperimentsEnabledOnWorld(mcworld, project) {
+        const itemsCopy = project.getItemsCopy();
+        for (const projectItem of itemsCopy) {
+            if (projectItem.itemType === IProjectItemData_1.ProjectItemType.behaviorPackManifestJson) {
+                await projectItem.ensureFileStorage();
+                if (projectItem.file) {
+                    await projectItem.file.loadContent();
+                    let content = projectItem.file.content;
+                    if (typeof content === "string" && content.indexOf("-beta") >= 0) {
+                        mcworld.betaApisExperiment = true;
+                    }
+                }
+            }
+            else if (projectItem.itemType === IProjectItemData_1.ProjectItemType.resourcePackManifestJson) {
+                await projectItem.ensureFileStorage();
+                if (projectItem.file) {
+                    await projectItem.file.loadContent();
+                    let content = projectItem.file.content;
+                    if (typeof content === "string" && content.indexOf("pbr") >= 0 && content.indexOf("capabilities") >= 0) {
+                        mcworld.deferredTechnicalPreviewExperiment = true;
+                    }
+                }
+            }
+        }
+    }
     static async generateBetaApisWorldWithPackRefs(project, worldName, worldContent) {
         const mcworld = new MCWorld_1.default();
         mcworld.project = project;

package/app/ProjectItem.js

@@ -261,6 +261,8 @@ class ProjectItem {
                 return "behavior/dialogue/dialogue.json";
             case IProjectItemData_2.ProjectItemType.entityTypeBehavior:
                 return "behavior/entities/entities.json";
+            case IProjectItemData_2.ProjectItemType.atmosphericsJson:
+                return "behavior/lighting/atmospherics.json";
             case IProjectItemData_2.ProjectItemType.blocksCatalogResourceJson:
                 return "resource/blocks.json";
             case IProjectItemData_2.ProjectItemType.soundCatalog:

package/app/ProjectItemUtilities.js

@@ -2,11 +2,49 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormMappings = void 0;
 const Utilities_1 = require("../core/Utilities");
 const Pack_1 = require("../minecraft/Pack");
 const StorageUtilities_1 = require("../storage/StorageUtilities");
 const IProjectItemData_1 = require("./IProjectItemData");
 const ProjectUtilities_1 = require("./ProjectUtilities");
+exports.FormMappings = {
+/*  ["" + ProjectItemType.atmosphericsJson]: {
+  formCategory: "client_deferred_rendering",
+  formName: "atmosphericscattering_atmosphericscatteringconfigsettings",
+  select: "minecraft:atmosphere_settings",
+},
+["" + ProjectItemType.colorGradingJson]: {
+  formCategory: "client_deferred_rendering",
+  formName: "colorgraderconfig_colorgradingparameterssrc",
+  select: "minecraft:color_grading_settings",
+},
+["" + ProjectItemType.lightingJson]: {
+  formCategory: "client_deferred_rendering",
+  formName: "lightinggroup_lightingimpl_1_21_70",
+  select: "minecraft:lighting_settings",
+},
+["" + ProjectItemType.pbrJson]: {
+  formCategory: "client_deferred_rendering",
+  formName: "pbrfallbackconfig_pbrfallbackconfigsettings",
+  select: "minecraft:pbr_fallback_settings",
+},
+["" + ProjectItemType.waterJson]: {
+  formCategory: "client_deferred_rendering",
+  formName: "waterconfig_waterconfigsettingsv1",
+  select: "minecraft:water_settings",
+},
+["" + ProjectItemType.shadowsJson]: {
+  formCategory: "client_deferred_rendering",
+  formName: "shadowstylizationconfig_shadowstylizationconfigsettings",
+  select: "minecraft:shadow_settings",
+},
+["" + ProjectItemType.pointLightsJson]: {
+  formCategory: "client_deferred_rendering",
+  formName: "pointlightconfig_pointlightconfigsettings",
+  select: "minecraft:point_light_settings",
+},*/
+};
 class ProjectItemUtilities {
     static inferTypeFromContent(content, fileName) {
         const type = StorageUtilities_1.default.getTypeFromName(fileName);
@@ -293,6 +331,13 @@ class ProjectItemUtilities {
             case IProjectItemData_1.ProjectItemType.resourcePackManifestJson:
             case IProjectItemData_1.ProjectItemType.entityTypeBehavior:
             case IProjectItemData_1.ProjectItemType.tickJson:
+            case IProjectItemData_1.ProjectItemType.aimAssistJson:
+            case IProjectItemData_1.ProjectItemType.waterJson:
+            case IProjectItemData_1.ProjectItemType.shadowsJson:
+            case IProjectItemData_1.ProjectItemType.pbrJson:
+            case IProjectItemData_1.ProjectItemType.atmosphericsJson:
+            case IProjectItemData_1.ProjectItemType.pointLightsJson:
+            case IProjectItemData_1.ProjectItemType.colorGradingJson:
             case IProjectItemData_1.ProjectItemType.cameraJson:
             case IProjectItemData_1.ProjectItemType.actionSet:
             case IProjectItemData_1.ProjectItemType.worldTest:
@@ -367,6 +412,7 @@ class ProjectItemUtilities {
             case IProjectItemData_1.ProjectItemType.dimensionJson:
             case IProjectItemData_1.ProjectItemType.behaviorPackHistoryListJson:
             case IProjectItemData_1.ProjectItemType.resourcePackHistoryListJson:
+            case IProjectItemData_1.ProjectItemType.educationJson:
                 return ["application/json"];
             case IProjectItemData_1.ProjectItemType.MCWorld:
             case IProjectItemData_1.ProjectItemType.MCTemplate:
@@ -451,8 +497,22 @@ class ProjectItemUtilities {
                 return "Fragment";
             case IProjectItemData_1.ProjectItemType.materialVertex:
                 return "Vertex";
+            case IProjectItemData_1.ProjectItemType.shadowsJson:
+                return "Shadow";
+            case IProjectItemData_1.ProjectItemType.waterJson:
+                return "Water";
+            case IProjectItemData_1.ProjectItemType.pbrJson:
+                return "PBR";
+            case IProjectItemData_1.ProjectItemType.atmosphericsJson:
+                return "Atmospherics";
+            case IProjectItemData_1.ProjectItemType.pointLightsJson:
+                return "Point Light";
+            case IProjectItemData_1.ProjectItemType.colorGradingJson:
+                return "Color Grading";
             case IProjectItemData_1.ProjectItemType.cameraJson:
                 return "Camera";
+            case IProjectItemData_1.ProjectItemType.aimAssistJson:
+                return "Aim Assist";
             case IProjectItemData_1.ProjectItemType.catalogIndexJs:
                 return "Catalog index";
             case IProjectItemData_1.ProjectItemType.behaviorPackFolder:
@@ -475,8 +535,6 @@ class ProjectItemUtilities {
                 return "Behavior pack animation controller";
             case IProjectItemData_1.ProjectItemType.blockTypeBehavior:
                 return "Block type";
-            case IProjectItemData_1.ProjectItemType.blockMaterialsBehaviorJson:
-                return "Block type materials";
             case IProjectItemData_1.ProjectItemType.itemTypeBehavior:
                 return "Item type";
             case IProjectItemData_1.ProjectItemType.lootTableBehavior:
@@ -633,6 +691,8 @@ class ProjectItemUtilities {
                 return "Behavior pack history";
             case IProjectItemData_1.ProjectItemType.resourcePackHistoryListJson:
                 return "Resource pack history";
+            case IProjectItemData_1.ProjectItemType.educationJson:
+                return "Education manifest";
             default:
                 return "Unknown";
         }
@@ -873,26 +933,27 @@ class ProjectItemUtilities {
                 return "TypeScript files";
             case IProjectItemData_1.ProjectItemType.js:
                 return "JavaScript files";
-            case IProjectItemData_1.ProjectItemType.vsCodeTasksJson:
-                return "VS Code task sets";
-            case IProjectItemData_1.ProjectItemType.vsCodeSettingsJson:
-                return "VS Code settings sets";
-            case IProjectItemData_1.ProjectItemType.globalVariablesJson:
-                return "UI global variable sets";
             case IProjectItemData_1.ProjectItemType.itemTypeResourceJson:
                 return "Item type visuals and audio";
-            case IProjectItemData_1.ProjectItemType.materialGeometry:
-                return "Model shapes";
             case IProjectItemData_1.ProjectItemType.entityTypeResource:
                 return "Entity type visuals/audio";
             case IProjectItemData_1.ProjectItemType.catalogIndexJs:
                 return "Catalog indexes";
-            case IProjectItemData_1.ProjectItemType.mcToolsProjectPreferences:
-                return "MCTools preferences";
             case IProjectItemData_1.ProjectItemType.behaviorPackHistoryListJson:
                 return "Behavior pack histories";
             case IProjectItemData_1.ProjectItemType.resourcePackHistoryListJson:
                 return "Resource pack histories";
+            case IProjectItemData_1.ProjectItemType.globalVariablesJson:
+            case IProjectItemData_1.ProjectItemType.materialGeometry:
+            case IProjectItemData_1.ProjectItemType.atmosphericsJson:
+            case IProjectItemData_1.ProjectItemType.biomeResourceJson:
+            case IProjectItemData_1.ProjectItemType.vsCodeTasksJson:
+            case IProjectItemData_1.ProjectItemType.vsCodeSettingsJson:
+            case IProjectItemData_1.ProjectItemType.vsCodeExtensionsJson:
+            case IProjectItemData_1.ProjectItemType.mcToolsProjectPreferences:
+            case IProjectItemData_1.ProjectItemType.materialsResourceJson:
+            case IProjectItemData_1.ProjectItemType.lang:
+                return this.getDescriptionForType(type);
             default:
                 return this.getDescriptionForType(type) + "s";
         }
@@ -1003,7 +1064,19 @@ class ProjectItemUtilities {
             case IProjectItemData_1.ProjectItemType.worldFolder:
             case IProjectItemData_1.ProjectItemType.MCWorld:
                 return ["worlds"];
-            case IProjectItemData_1.ProjectItemType.cameraJson:
+            case IProjectItemData_1.ProjectItemType.colorGradingJson:
+                return ["color_grading"];
+            case IProjectItemData_1.ProjectItemType.atmosphericsJson:
+                return ["atmospherics"];
+            case IProjectItemData_1.ProjectItemType.pbrJson:
+                return ["pbr"];
+            case IProjectItemData_1.ProjectItemType.pointLightsJson:
+                return ["point_lights"];
+            case IProjectItemData_1.ProjectItemType.shadowsJson:
+                return ["shadows"];
+            case IProjectItemData_1.ProjectItemType.waterJson:
+                return ["water"];
+            case IProjectItemData_1.ProjectItemType.aimAssistJson:
                 return ["cameras"];
             case IProjectItemData_1.ProjectItemType.dimensionJson:
                 return ["dimensions"];

package/app/ProjectUtilities.js

@@ -25,6 +25,7 @@ const ProjectStandard_1 = require("./ProjectStandard");
 const ProjectAutogeneration_1 = require("./ProjectAutogeneration");
 const MinecraftDefinitions_1 = require("../minecraft/MinecraftDefinitions");
 const TypeScriptDefinition_1 = require("../minecraft/TypeScriptDefinition");
+const Constants_1 = require("../core/Constants");
 var NewEntityTypeAddMode;
 (function (NewEntityTypeAddMode) {
     NewEntityTypeAddMode[NewEntityTypeAddMode["baseId"] = 0] = "baseId";
@@ -210,6 +211,28 @@ class ProjectUtilities {
     static async applyShortName(project, newShortName) {
         project.shortName = newShortName;
     }
+    static async ensureGeneratedWith(project, isToolWeb) {
+        const appName = isToolWeb ? "mctoolsweb" : "mctoolscli";
+        if (project.editPreference === IProjectData_1.ProjectEditPreference.summarized && project.defaultBehaviorPackUniqueId) {
+            const itemsCopy = project.getItemsCopy();
+            for (const projectItem of itemsCopy) {
+                if (projectItem.file && projectItem.itemType === IProjectItemData_1.ProjectItemType.behaviorPackManifestJson) {
+                    const bpManifestJson = await BehaviorManifestDefinition_1.default.ensureOnFile(projectItem.file);
+                    if (bpManifestJson && bpManifestJson.definition) {
+                        bpManifestJson.ensureGeneratedWith(appName, Constants_1.constants.version);
+                        await bpManifestJson.save();
+                    }
+                }
+                else if (projectItem.file && projectItem.itemType === IProjectItemData_1.ProjectItemType.resourcePackManifestJson) {
+                    const rpManifestJson = await ResourceManifestDefinition_1.default.ensureOnFile(projectItem.file);
+                    if (rpManifestJson && rpManifestJson.definition) {
+                        rpManifestJson.ensureGeneratedWith(appName, Constants_1.constants.version);
+                        await rpManifestJson.save();
+                    }
+                }
+            }
+        }
+    }
     static async applyTitle(project, newTitle) {
         project.title = newTitle;
         if (project.editPreference === IProjectData_1.ProjectEditPreference.summarized && project.defaultBehaviorPackUniqueId) {
@@ -363,7 +386,7 @@ class ProjectUtilities {
         }
         return scriptsFolder.getFolderRelativePath(project.projectFolder);
     }
-    static async processNewProject(project, title, description, suggestedShortName) {
+    static async processNewProject(project, title, description, suggestedShortName, isWeb) {
         await project.inferProjectItemsFromFiles();
         if (suggestedShortName) {
             await ProjectExporter_1.default.renameDefaultFolders(project, suggestedShortName);
@@ -372,6 +395,7 @@ class ProjectUtilities {
         await ProjectUtilities.randomizeAllUids(project);
         await ProjectUtilities.applyTitle(project, title);
         await ProjectUtilities.applyDescription(project, description);
+        await ProjectUtilities.ensureGeneratedWith(project, isWeb);
         await ProjectStandard_1.default.ensureIsStandard(project);
         const pur = new ProjectUpdateRunner_1.default(project);
         await pur.updateProject();

package/cli/TaskWorker.js

@@ -11,6 +11,7 @@ const ProjectInfoSet_1 = require("../info/ProjectInfoSet");
 const IInfoItemData_1 = require("../info/IInfoItemData");
 const LocalEnvironment_1 = require("../local/LocalEnvironment");
 const ProjectUtilities_1 = require("../app/ProjectUtilities");
+const ZipStorage_1 = require("../storage/ZipStorage");
 let carto;
 let localEnv;
 let outputStorage;
@@ -200,13 +201,22 @@ async function outputResults(projectSet, pis, fileNameModifier, outputStorage, m
             const mciContentFile = indexFolder.ensureFile(StorageUtilities_1.default.ensureFileNameIsSafe(StorageUtilities_1.default.getBaseFromName(projectSet.projectContainerName)) +
                 fileNameModifier +
                 ".mci.json");
+            const mciContentFileZip = indexFolder.ensureFile(StorageUtilities_1.default.ensureFileNameIsSafe(StorageUtilities_1.default.getBaseFromName(projectSet.projectContainerName)) +
+                fileNameModifier +
+                ".mci.json.zip");
+            let contentStr = "";
             if (outputType === ClUtils_1.OutputType.noReports) {
-                mciContentFile.setContent(pis.getStrictIndexJson(projectSet.projectName, projectSet.projectPath, undefined));
+                contentStr = pis.getStrictIndexJson(projectSet.projectName, projectSet.projectPath, undefined);
             }
             else {
-                mciContentFile.setContent(pis.getIndexJson(projectSet.projectName, projectSet.projectPath, undefined));
+                contentStr = pis.getIndexJson(projectSet.projectName, projectSet.projectPath, undefined);
             }
+            mciContentFile.setContent(contentStr);
             mciContentFile.saveContent();
+            const zs = ZipStorage_1.default.fromJsonString(contentStr);
+            const contentBytes = await zs.generateUint8ArrayAsync();
+            mciContentFileZip.setContent(contentBytes);
+            mciContentFileZip.saveContent();
         }
         if (outputType !== ClUtils_1.OutputType.noReports) {
             const csvFile = outputStorage.rootFolder.ensureFile(StorageUtilities_1.default.ensureFileNameIsSafe(StorageUtilities_1.default.getBaseFromName(projectSet.projectContainerName)) +

package/core/Constants.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constants = void 0;
 exports.constants = {
-    version: "0.9.0",
+    version: "0.9.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/ContentIndex.js

@@ -31,6 +31,9 @@ var AnnotationCategory;
     AnnotationCategory["itemTypeDependent"] = "i";
     AnnotationCategory["itemComponentDependent"] = "j";
     AnnotationCategory["itemTextureReferenceSource"] = "k";
+    AnnotationCategory["featureSource"] = "l";
+    AnnotationCategory["featureDependent"] = "m";
+    AnnotationCategory["featureRuleSource"] = "n";
     AnnotationCategory["blockComponentDependentInPermutation"] = "p";
     AnnotationCategory["storagePathDependent"] = "s";
     AnnotationCategory["textureFile"] = "t";

package/core/Utilities.js

@@ -28,6 +28,22 @@ class Utilities {
         }
         return Utilities._isDebug;
     }
+    static selectJsonObject(jsonO, select, ensureObjects) {
+        const selectors = select.split("/");
+        for (const selector of selectors) {
+            if (selector.length > 0) {
+                jsonO = jsonO[selector];
+                if (!jsonO && !ensureObjects) {
+                    return undefined;
+                }
+                if (!jsonO && ensureObjects) {
+                    jsonO[selector] = {};
+                    jsonO = jsonO[selector];
+                }
+            }
+        }
+        return jsonO;
+    }
     static removeItemInArray(objToRemove, stringArr) {
         const nextArray = [];
         for (const candStr of stringArr) {
@@ -233,6 +249,14 @@ class Utilities {
         }
         return Utilities.humanifyMinecraftName(val);
     }
+    static ensureFirstCharIsUpperCase(name) {
+        if (name.length > 1) {
+            if (name[0] >= "a" && name[0] <= "z") {
+                name = name[0].toUpperCase() + name.substring(1, name.length);
+            }
+        }
+        return name;
+    }
     static humanifyString(val, humanify) {
         if (!humanify || val === undefined) {
             return val;
@@ -254,6 +278,69 @@ class Utilities {
         name = name.replace(/ /gi, "");
         return name;
     }
+    static sanitizeJavascriptName(name) {
+        name = name.trim();
+        name = name.replace(/</gi, "LessThan");
+        name = name.replace(/>/gi, "GreaterThan");
+        name = name.replace(/=/gi, "Equals");
+        name = name.replace(/!/gi, "Not");
+        name = name.replace(/\+/gi, "Plus");
+        name = name.replace(/,/gi, "");
+        name = name.replace(/-/gi, "");
+        name = name.replace(/\./gi, "");
+        name = name.replace(/'/gi, "");
+        name = name.replace(/ /gi, "");
+        name = name.replace(/\[/gi, "");
+        name = name.replace(/\]/gi, "");
+        name = name.replace(/"/gi, "");
+        name = name.replace(/\{/gi, "");
+        name = name.replace(/\}/gi, "");
+        name = name.replace(/</gi, "");
+        name = name.replace(/>/gi, "");
+        name = name.replace(/\*/gi, "");
+        name = name.replace(/\?/gi, "");
+        name = name.replace(/\\/gi, "");
+        name = name.replace(/\|/gi, "");
+        if (name.length > 0 && name[0] >= "0" && name[0] <= "9") {
+            name = "_" + name;
+        }
+        if (name.indexOf(":") >= 0) {
+            name = '"' + name + '"';
+        }
+        return name;
+    }
+    static javascriptifyName(name, capitalizeFrst) {
+        name = name.trim();
+        let retVal = "";
+        let capitalizeNext = capitalizeFrst === true;
+        for (let i = 0; i < name.length; i++) {
+            if (name[i] === " " ||
+                name[i] === "_" ||
+                name[i] === ":" ||
+                name[i] === "," ||
+                name[i] === "." ||
+                name[i] === '"' ||
+                name[i] === "'" ||
+                name[i] === "+" ||
+                name[i] === "-" ||
+                name[i] === ":" ||
+                name[i] === "[" ||
+                name[i] === "]") {
+                capitalizeNext = true;
+            }
+            else {
+                if (capitalizeNext) {
+                    retVal += name[i].toUpperCase();
+                    capitalizeNext = false;
+                }
+                else {
+                    retVal += name[i];
+                }
+            }
+        }
+        retVal = this.sanitizeJavascriptName(retVal);
+        return retVal;
+    }
     static humanifyMinecraftName(name) {
         if (typeof name === "boolean" || typeof name === "number") {
             return name.toString();
@@ -285,6 +372,13 @@ class Utilities {
         }
         name = name.replace(/::/gi, " ");
         name = name.replace(/:/gi, " ");
+        name = name.replace("SharedTypes ", "");
+        if (name.startsWith("Struct ") || name.startsWith("struct ")) {
+            name = name.substring(7);
+        }
+        if ((name.startsWith("Enum ") || name.startsWith("enum ")) && name.indexOf("num_property") < 0) {
+            name = name.substring(5);
+        }
         const lastPeriod = name.indexOf(".");
         if (lastPeriod >= 4) {
             name = name.substring(lastPeriod + 1) + " " + name.substring(0, lastPeriod);