mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-01-30 15:42:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change plugin loading log messages

Browse Source 
Take project name for name suggestion when exporting modded entity
This commit is contained in:
JannisX11 2023-02-04 20:22:54 +01:00
parent ed9cec5747
commit a7ec36be6f
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/io/formats/bedrock_old.js
View File

@ -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

2
js/io/formats/modded_entity.js
View File

@ -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() {

18
js/plugin_loader.js
View File

@ -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')