From 6257638029995d1c2d157a9f350678517f780b7c Mon Sep 17 00:00:00 2001 From: Furoxfufu Date: Tue, 28 Mar 2023 20:27:22 +0200 Subject: [PATCH] Change Site-33 to Zone-Delta --- app/app.ejs | 2 +- app/assets/js/authmanager.js | 4 +++- app/assets/js/distromanager.js | 5 +++-- app/assets/js/ipcconstants.js | 3 +-- app/assets/js/scripts/landing.js | 8 ++++---- app/settings.ejs | 6 +++--- package.json | 10 +++++----- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/app.ejs b/app/app.ejs index 2958a401..ff023acb 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -1,7 +1,7 @@ - Site-33 Launcher + Zone-Delta Launcher diff --git a/app/assets/js/authmanager.js b/app/assets/js/authmanager.js index ed627604..332ebf89 100644 --- a/app/assets/js/authmanager.js +++ b/app/assets/js/authmanager.js @@ -33,8 +33,10 @@ const log = LoggerUtil.getLogger('AuthManager') * @returns {Promise.} Promise which resolves the resolved authenticated account object. */ exports.addMojangAccount = async function(email, password, a2f) { + // Site pas encore dispo + //const auth = new azAuth.AuthClient('https://zone-delta.xyz') const auth = new azAuth.AuthClient('https://site-33.net') - + let result if (a2f === null) result = await auth.login(email, password) diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 4fcc6852..bf2f3cf1 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -543,9 +543,10 @@ let data = null * @returns {Promise.} */ exports.pullRemote = function(){ - if(DEV_MODE){ + //TODO Provisoire + /*if(DEV_MODE){ return exports.pullLocal() - } + }*/ return new Promise((resolve, reject) => { const distroURL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json' //const distroURL = 'https://gist.githubusercontent.com/dscalzi/53b1ba7a11d26a5c353f9d5ae484b71b/raw/' diff --git a/app/assets/js/ipcconstants.js b/app/assets/js/ipcconstants.js index a04f666d..d15205ed 100644 --- a/app/assets/js/ipcconstants.js +++ b/app/assets/js/ipcconstants.js @@ -21,8 +21,7 @@ exports.MSFT_REPLY_TYPE = { exports.MSFT_ERROR = { ALREADY_OPEN: 'MSFT_AUTH_ERR_ALREADY_OPEN', NOT_FINISHED: 'MSFT_AUTH_ERR_NOT_FINISHED' -} - */ +}*/ exports.SHELL_OPCODE = { TRASH_ITEM: 'TRASH_ITEM' } \ No newline at end of file diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 03489047..c7f8c0ce 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -160,7 +160,7 @@ server_selection_button.onclick = (e) => { } // Update Mojang Status Color -const refreshMojangStatuses = async function(){ +/*const refreshMojangStatuses = async function(){ loggerLanding.info('Refreshing Mojang Statuses..') let status = 'grey' @@ -218,7 +218,7 @@ const refreshMojangStatuses = async function(){ document.getElementById('mojangStatusEssentialContainer').innerHTML = tooltipEssentialHTML document.getElementById('mojangStatusNonEssentialContainer').innerHTML = tooltipNonEssentialHTML document.getElementById('mojang_status_icon').style.color = MojangRestAPI.statusToHex(status) -} +}*/ const refreshServerStatus = async function(fade = false){ loggerLanding.info('Refreshing Server Status') @@ -251,11 +251,11 @@ const refreshServerStatus = async function(fade = false){ } -refreshMojangStatuses() +//refreshMojangStatuses() // Server Status is refreshed in uibinder.js on distributionIndexDone. // Refresh statuses every hour. The status page itself refreshes every day so... -let mojangStatusListener = setInterval(() => refreshMojangStatuses(true), 60*60*1000) +//let mojangStatusListener = setInterval(() => refreshMojangStatuses(true), 60*60*1000) // Set refresh rate to once every 5 minutes. let serverStatusListener = setInterval(() => refreshServerStatus(true), 300000) diff --git a/app/settings.ejs b/app/settings.ejs index cab9d60e..21f85f1c 100644 --- a/app/settings.ejs +++ b/app/settings.ejs @@ -57,10 +57,10 @@ - Site + Zone-Delta compte
- +
@@ -314,7 +314,7 @@
- Site-33 Launcher + Zone-Delta Launcher
✓
diff --git a/package.json b/package.json index 9a58707b..fbf08fdd 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "Site-33-Launcher", + "name": "Zone_Delta_Launcher", "version": "0.0.2", - "productName": "Site-33-Launcher", + "productName": "Zone_Delta_Launcher", "description": "Modded Minecraft Launcher", - "author": "Site-33 (Fork of Daniel Scalzi (https://github.com/dscalzi/))", + "author": "Zone-Delta (Fork of Daniel Scalzi (https://github.com/dscalzi/))", "license": "UNLICENSED", - "homepage": "https://github.com/project-site-33/Site-33-Launcher", + "homepage": "https://github.com/project-site-33/Zone_Delta_Launcher", "bugs": { - "url": "https://github.com/project-site-33/Site-33-Launcher/issues" + "url": "https://github.com/project-site-33/Zone_Delta_Launcher/issues" }, "private": true, "main": "index.js",