diff --git a/atlas/root/distribution.json b/atlas/root/distribution.json index 81028b7..6fe33eb 100644 --- a/atlas/root/distribution.json +++ b/atlas/root/distribution.json @@ -421,6 +421,19 @@ "MD5": "b15fd6703384c58c19d30624923460a5" } }, + { + "id": "fr.surviepote:pala:0.1.0@jar", + "name": "Pala (SurviePote)", + "type": "FabricMod", + "artifact": { + "size": 1496354, + "url": "https://git.kisakay.com/k/mc/raw/branch/main/atlas/root/servers/SurviePote-26.3/fabricmods/optionalon/pala-0.1.0.jar", + "MD5": "d06d77636129984b2f7614466273452f" + }, + "required": { + "value": false + } + }, { "id": "net.lopymine.patpat.entrypoint.impl:patpat:1.3.2+26.3+fabric@jar", "name": "PatPat", diff --git a/atlas/root/servers/SurviePote-26.3/fabricmods/optionalon/pala-0.1.0.jar b/atlas/root/servers/SurviePote-26.3/fabricmods/optionalon/pala-0.1.0.jar new file mode 100644 index 0000000..697d301 Binary files /dev/null and b/atlas/root/servers/SurviePote-26.3/fabricmods/optionalon/pala-0.1.0.jar differ diff --git a/launcher/app/app.ejs b/launcher/app/app.ejs index 75b5ea2..bfef51a 100644 --- a/launcher/app/app.ejs +++ b/launcher/app/app.ejs @@ -40,8 +40,7 @@
- - +
diff --git a/launcher/app/assets/css/launcher.css b/launcher/app/assets/css/launcher.css index a77f734..d01a23f 100644 --- a/launcher/app/assets/css/launcher.css +++ b/launcher/app/assets/css/launcher.css @@ -3940,18 +3940,10 @@ input:checked + .toggleSwitchSlider:before { /* Stationary image for the spinner. */ #loadCenterImage { - position: absolute; - width: 277px; + width: 200px; height: auto; } -/* Rotating image for the spinner. */ -#loadSpinnerImage { - width: 280px; - height: auto; - z-index: 400; -} - /* Rotating animation for the spinner. */ @keyframes rotating { from { diff --git a/launcher/app/assets/js/scripts/loginOptions.js b/launcher/app/assets/js/scripts/loginOptions.js index cdb1bc8..ba69956 100644 --- a/launcher/app/assets/js/scripts/loginOptions.js +++ b/launcher/app/assets/js/scripts/loginOptions.js @@ -1,6 +1,5 @@ const loginOptionsCancelContainer = document.getElementById('loginOptionCancelContainer') const loginOptionMicrosoft = document.getElementById('loginOptionMicrosoft') -const loginOptionMojang = document.getElementById('loginOptionMojang') const loginOptionsCancelButton = document.getElementById('loginOptionCancelButton') let loginOptionsCancellable = false @@ -28,20 +27,9 @@ loginOptionMicrosoft.onclick = (e) => { }) } -loginOptionMojang.onclick = (e) => { - switchView(getCurrentView(), VIEWS.login, 500, 500, () => { - loginViewOnSuccess = loginOptionsViewOnLoginSuccess - loginViewOnCancel = loginOptionsViewOnLoginCancel - loginCancelEnabled(true) - }) -} - loginOptionsCancelButton.onclick = (e) => { switchView(getCurrentView(), loginOptionsViewOnCancel, 500, 500, () => { - // Clear login values (Mojang login) // No cleanup needed for Microsoft. - loginUsername.value = '' - loginPassword.value = '' if(loginOptionsViewCancelHandler != null){ loginOptionsViewCancelHandler() loginOptionsViewCancelHandler = null diff --git a/launcher/app/assets/js/scripts/settings.js b/launcher/app/assets/js/scripts/settings.js index 81a65a7..0cd8351 100644 --- a/launcher/app/assets/js/scripts/settings.js +++ b/launcher/app/assets/js/scripts/settings.js @@ -342,15 +342,6 @@ settingsNavDone.onclick = () => { const msftLoginLogger = LoggerUtil.getLogger('Microsoft Login') const msftLogoutLogger = LoggerUtil.getLogger('Microsoft Logout') -// Bind the add mojang account button. -document.getElementById('settingsAddMojangAccount').onclick = (e) => { - switchView(getCurrentView(), VIEWS.login, 500, 500, () => { - loginViewOnCancel = VIEWS.settings - loginViewOnSuccess = VIEWS.settings - loginCancelEnabled(true) - }) -} - // Bind the add microsoft account button. document.getElementById('settingsAddMicrosoftAccount').onclick = (e) => { switchView(getCurrentView(), VIEWS.waiting, 500, 500, () => { @@ -619,7 +610,6 @@ function refreshAuthAccountSelected(uuid){ } const settingsCurrentMicrosoftAccounts = document.getElementById('settingsCurrentMicrosoftAccounts') -const settingsCurrentMojangAccounts = document.getElementById('settingsCurrentMojangAccounts') /** * Add auth account elements for each one stored in the authentication database. @@ -633,11 +623,15 @@ function populateAuthAccounts(){ const selectedUUID = ConfigManager.getSelectedAccount().uuid let microsoftAuthAccountStr = '' - let mojangAuthAccountStr = '' authKeys.forEach((val) => { const acc = authAccounts[val] + // Les vieux comptes Mojang sont ignorés (auth Mojang supprimée). + if(acc.type !== 'microsoft') { + return + } + const accHtml = `
${acc.displayName} @@ -662,16 +656,11 @@ function populateAuthAccounts(){
` - if(acc.type === 'microsoft') { - microsoftAuthAccountStr += accHtml - } else { - mojangAuthAccountStr += accHtml - } + microsoftAuthAccountStr += accHtml }) settingsCurrentMicrosoftAccounts.innerHTML = microsoftAuthAccountStr - settingsCurrentMojangAccounts.innerHTML = mojangAuthAccountStr } /** diff --git a/launcher/app/assets/js/scripts/uibinder.js b/launcher/app/assets/js/scripts/uibinder.js index b68777c..0cc158c 100644 --- a/launcher/app/assets/js/scripts/uibinder.js +++ b/launcher/app/assets/js/scripts/uibinder.js @@ -97,9 +97,7 @@ async function showMainUI(data){ } setTimeout(() => { - $('#loadingContainer').fadeOut(500, () => { - $('#loadSpinnerImage').removeClass('rotating') - }) + $('#loadingContainer').fadeOut(500) }, 250) }, 750) diff --git a/launcher/app/loginOptions.ejs b/launcher/app/loginOptions.ejs index 20aa67c..1266995 100644 --- a/launcher/app/loginOptions.ejs +++ b/launcher/app/loginOptions.ejs @@ -14,16 +14,6 @@ <%- lang('loginOptions.loginWithMicrosoft') %> -
- -
- -
-
-
- - - - - - <%- lang('settings.mojangAccount') %> -
-
- -
-
- -
- -
-