Fix Paper startup before worlds load and add 0.5.0 artifacts
This commit is contained in:
1 parent
c0daa0507a
commit
434ed5338a
21 files changed
+60
-17
No files matched your search
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "scopenet-launcher",
|
||||
"private": true,
|
||||
"version": "0.4.0",
|
||||
"version": "0.5.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -10,9 +10,15 @@ use std::sync::{Mutex, RwLock};
|
||||
/// Values baked in at build time by CI (see `.github/workflows/release.yml`).
|
||||
pub mod build {
|
||||
/// Default panel URL for this build.
|
||||
pub const PANEL_URL: Option<&str> = option_env!("SCOPENET_PANEL_URL");
|
||||
pub const PANEL_URL: Option<&str> = match option_env!("SCOPENET_PANEL_URL") {
|
||||
Some(u) if !u.is_empty() => Some(u),
|
||||
_ => Some("https://scopenetmcpanel.scopedd.lol"),
|
||||
};
|
||||
/// `owner/repo` used to check GitHub releases for updates.
|
||||
pub const REPO: Option<&str> = option_env!("SCOPENET_REPO");
|
||||
pub const REPO: Option<&str> = match option_env!("SCOPENET_REPO") {
|
||||
Some(r) if !r.is_empty() => Some(r),
|
||||
_ => Some("scopeddlol/SCOPENET-MC"),
|
||||
};
|
||||
/// When set to "1", players can't change the panel URL.
|
||||
pub const LOCK_PANEL: Option<&str> = option_env!("SCOPENET_LOCK_PANEL");
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "SCOPENET Launcher",
|
||||
"version": "0.4.0",
|
||||
"version": "0.5.0",
|
||||
"identifier": "net.scopenet.launcher",
|
||||
"build": {
|
||||
"beforeDevCommand": "npm run dev",
|
||||
|
||||
@@ -90,9 +90,17 @@ export async function init() {
|
||||
theme();
|
||||
pickSelected();
|
||||
subscribe();
|
||||
app.ready = true;
|
||||
invoke('show_window').catch(() => {});
|
||||
if (app.panelUrl) await refresh();
|
||||
if (app.panelUrl && !app.manifest) {
|
||||
try {
|
||||
await refresh();
|
||||
} finally {
|
||||
app.ready = true;
|
||||
}
|
||||
} else {
|
||||
app.ready = true;
|
||||
if (app.panelUrl) await refresh();
|
||||
}
|
||||
if (boot.settings.check_updates && boot.app.repo) {
|
||||
invoke<UpdateInfo | null>('check_update').then((u) => (app.update = u)).catch(() => {});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user