diff --git a/js/io/formats/bedrock_old.js b/js/io/formats/bedrock_old.js index 91ff5eea..49b8dce3 100644 --- a/js/io/formats/bedrock_old.js +++ b/js/io/formats/bedrock_old.js @@ -241,7 +241,7 @@ var codec = new Codec('bedrock_old', { if (options.raw) { return entitymodel } else { - var model_name = 'geometry.' + (Project.geometry_name||'unknown') + var model_name = 'geometry.' + (Project.geometry_name||Project.name||'unknown') return autoStringify({ format_version: '1.10.0', [model_name]: entitymodel diff --git a/js/io/formats/modded_entity.js b/js/io/formats/modded_entity.js index 3926d85f..f3765421 100644 --- a/js/io/formats/modded_entity.js +++ b/js/io/formats/modded_entity.js @@ -296,7 +296,7 @@ const Templates = { } function getIdentifier() { - return (Project.geometry_name && Project.geometry_name.replace(/[\s-]+/g, '_')) || 'custom_model'; + return (Project.geometry_name && Project.geometry_name.replace(/[\s-]+/g, '_')) || Project.name || 'custom_model'; } function askToSaveProject() { diff --git a/js/plugin_loader.js b/js/plugin_loader.js index f2860d7b..e952998c 100644 --- a/js/plugin_loader.js +++ b/js/plugin_loader.js @@ -483,7 +483,7 @@ async function loadInstalledPlugins() { }) } if (Plugins.installed.length > 0) { - var loaded = [] + var load_counter = 0; Plugins.installed.forEachReverse(function(plugin) { if (plugin.source == 'file') { @@ -491,7 +491,8 @@ async function loadInstalledPlugins() { if (isApp && fs.existsSync(plugin.path)) { var instance = new Plugin(plugin.id); install_promises.push(instance.loadFromFile({path: plugin.path}, false)); - loaded.push(['Local', plugin.id || plugin.path]); + load_counter++; + console.log(`🧩📁 Loaded plugin "${plugin.id || plugin.path}" from file`); } else { Plugins.installed.remove(plugin) } @@ -499,18 +500,15 @@ async function loadInstalledPlugins() { } else if (plugin.source == 'url') { var instance = new Plugin(plugin.id); install_promises.push(instance.loadFromURL(plugin.path, false)); - loaded.push(['URL', plugin.id || plugin.path]); + load_counter++; + console.log(`🧩🌐 Loaded plugin "${plugin.id || plugin.path}" from URL`); } else { - loaded.push(['Store', plugin.id]); + load_counter++; + console.log(`🧩🛒 Loaded plugin "${plugin.id}" from store`) } }) - console.log(`Loaded ${loaded.length} plugin${pluralS(loaded.length)}`) - let list = {}; - loaded.forEach(([type, id]) => { - list[id] = type; - }) - console.table(list); + console.log(`Loaded ${load_counter} plugin${pluralS(load_counter)}`) } StateMemory.save('installed_plugins')