mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-04-06 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Additional fix for #697

Browse Source 
Open with Blockbench ignores plugin formats
This commit is contained in:
JannisX11 2020-09-17 16:50:29 +02:00
parent 619078e714
commit 7a8cdd7c93
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/plugin_loader.js
View File

@ -6,7 +6,6 @@ const Plugins = {
json: undefined, //Json from website
all: [], //Vue Object Data
registered: {},
loadingStep: false,
updateSearch() {
Plugins.Vue._data.showAll = !Plugins.Vue._data.showAll
Plugins.Vue._data.showAll = !Plugins.Vue._data.showAll
@ -326,21 +325,25 @@ if (isApp) {
} else {
Plugins.path = 'https://cdn.jsdelivr.net/gh/JannisX11/blockbench-plugins/plugins/';
}
$.getJSON(Plugins.apipath, function(data) {
Plugins.json = data
loadInstalledPlugins()
}).fail(function() {
console.log('Could not connect to plugin server')
$('#plugin_available_empty').text('Could not connect to plugin server')
loadInstalledPlugins()
Plugins.loading_promise = new Promise((resolve, reject) => {
$.getJSON(Plugins.apipath, function(data) {
Plugins.json = data
resolve();
Plugins.loading_promise.resolved = true;
}).fail(function() {
console.log('Could not connect to plugin server')
$('#plugin_available_empty').text('Could not connect to plugin server')
resolve();
Plugins.loading_promise.resolved = true;
})
})
async function loadInstalledPlugins() {
const install_promises = [];
if (!Plugins.loadingStep) {
Plugins.loadingStep = true
return;
if (!Plugins.loading_promise.resolved) {
await Plugins.loading_promise;
}
const install_promises = [];
if (localStorage.getItem('installed_plugins')) {
var legacy_plugins = JSON.parse(localStorage.getItem('installed_plugins'))
if (legacy_plugins instanceof Array) {