Jonttu/HeliosLauncher
1
0
Fork 1
mirror of https://github.com/dscalzi/HeliosLauncher.git synced 2024-12-22 11:42:14 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sandro Soria 2024-10-24 16:10:27 +02:00
commit 1476dbb67b
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ajouts/version code final/dlAsync.js
View File

@ -1,21 +1,22 @@
/** /**
* @Name dlAsync Function * @Name dlAsync Function
* @async
* @param {boolean} login
* @returns {Promise<void>} * @returns {Promise<void>}
* *
* @author Sandro642 * @author Sandro642
* @Cheating Athena's Shield * @Cheating Athena's Shield
* @Ajout Liste blanche des mods *
* @Added whitelist for mods
* @Added support for the new HeliosLauncher version
*/ */
/** /**
* @Révision le XX.XX.2024 périme le 01.01.2025 * @Reviewed on XX.XX.2024 expires on 01.01.2025
* @Bug découvert : 0 * @Bugs discovered: 0
* @Athena's Shield * @Athena's Shield
* @Sandro642 * @Sandro642
*/ */
// ▄▄▄ ▄▄▄█████▓ ██░ ██ ▓█████ ███▄ █ ▄▄▄ ██████ ██████ ██░ ██ ██▓▓█████ ██▓ ▓█████▄ // ▄▄▄ ▄▄▄█████▓ ██░ ██ ▓█████ ███▄ █ ▄▄▄ ██████ ██████ ██░ ██ ██▓▓█████ ██▓ ▓█████▄
// ▒████▄ ▓ ██▒ ▓▒▓██░ ██▒▓█ ▀ ██ ▀█ █ ▒████▄ ▒██ ▒ ▒██ ▒ ▓██░ ██▒▓██▒▓█ ▀ ▓██▒ ▒██▀ ██▌ // ▒████▄ ▓ ██▒ ▓▒▓██░ ██▒▓█ ▀ ██ ▀█ █ ▒████▄ ▒██ ▒ ▒██ ▒ ▓██░ ██▒▓██▒▓█ ▀ ▓██▒ ▒██▀ ██▌
// ▒██ ▀█▄ ▒ ▓██░ ▒░▒██▀▀██░▒███ ▓██ ▀█ ██▒▒██ ▀█▄ ░ ▓██▄ ░ ▓██▄ ▒██▀▀██░▒██▒▒███ ▒██░ ░██ █▌ // ▒██ ▀█▄ ▒ ▓██░ ▒░▒██▀▀██░▒███ ▓██ ▀█ ██▒▒██ ▀█▄ ░ ▓██▄ ░ ▓██▄ ▒██▀▀██░▒██▒▒███ ▒██░ ░██ █▌
@ -326,7 +327,7 @@ async function dlAsync(login = true) {
}) })
setTimeout(() => { setTimeout(() => {
loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.launchingGame')) loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.waintingLaunchingGame'))
}, MIN_LINGER) }, MIN_LINGER)
} }
} }

16
ajouts/version code final/landing.js
View File

@ -30,9 +30,8 @@ const {
// Internal Requirements // Internal Requirements
const DiscordWrapper = require('./assets/js/discordwrapper') const DiscordWrapper = require('./assets/js/discordwrapper')
const ProcessBuilder = require('./assets/js/processbuilder') const ProcessBuilder = require('./assets/js/processbuilder')
const Lang = require('./app/assets/js/langloader')
const dataPath = require('./app/assets/configmanager') const dataPath = require('./app/assets/configmanager')
const path = require('path') const fs = require('fs')
// Launch Elements // Launch Elements
const launch_content = document.getElementById('launch_content') const launch_content = document.getElementById('launch_content')
@ -442,22 +441,23 @@ async function downloadJava(effectiveJavaOptions, launchAfter = true) {
/** /**
* @Name dlAsync Function * @Name dlAsync Function
* @async
* @param {boolean} login
* @returns {Promise<void>} * @returns {Promise<void>}
* *
* @author Sandro642 * @author Sandro642
* @Cheating Athena's Shield * @Cheating Athena's Shield
* @Ajout Liste blanche des mods *
* @Added whitelist for mods
* @Added support for the new HeliosLauncher version
*/ */
/** /**
* @Révision le XX.XX.2024 périme le 01.01.2025 * @Reviewed on XX.XX.2024 expires on 01.01.2025
* @Bug découvert : 0 * @Bugs discovered: 0
* @Athena's Shield * @Athena's Shield
* @Sandro642 * @Sandro642
*/ */
// ▄▄▄ ▄▄▄█████▓ ██░ ██ ▓█████ ███▄ █ ▄▄▄ ██████ ██████ ██░ ██ ██▓▓█████ ██▓ ▓█████▄ // ▄▄▄ ▄▄▄█████▓ ██░ ██ ▓█████ ███▄ █ ▄▄▄ ██████ ██████ ██░ ██ ██▓▓█████ ██▓ ▓█████▄
// ▒████▄ ▓ ██▒ ▓▒▓██░ ██▒▓█ ▀ ██ ▀█ █ ▒████▄ ▒██ ▒ ▒██ ▒ ▓██░ ██▒▓██▒▓█ ▀ ▓██▒ ▒██▀ ██▌ // ▒████▄ ▓ ██▒ ▓▒▓██░ ██▒▓█ ▀ ██ ▀█ █ ▒████▄ ▒██ ▒ ▒██ ▒ ▓██░ ██▒▓██▒▓█ ▀ ▓██▒ ▒██▀ ██▌
// ▒██ ▀█▄ ▒ ▓██░ ▒░▒██▀▀██░▒███ ▓██ ▀█ ██▒▒██ ▀█▄ ░ ▓██▄ ░ ▓██▄ ▒██▀▀██░▒██▒▒███ ▒██░ ░██ █▌ // ▒██ ▀█▄ ▒ ▓██░ ▒░▒██▀▀██░▒███ ▓██ ▀█ ██▒▒██ ▀█▄ ░ ▓██▄ ░ ▓██▄ ▒██▀▀██░▒██▒▒███ ▒██░ ░██ █▌
@ -742,7 +742,7 @@ async function dlAsync(login = true) {
}) })
setTimeout(() => { setTimeout(() => {
loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.launchingGame')) loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.waintingLaunchingGame'))
}, MIN_LINGER) }, MIN_LINGER)
} }
} }

2
app/assets/lang/en_US.toml
View File

@ -213,7 +213,7 @@ accountToProcessBuilder = "Sending selected account ({userDisplayName}) to Proce
gameError = "Game error: {data}" gameError = "Game error: {data}"
gameExited = "Game process exited with code {code}." gameExited = "Game process exited with code {code}."
gameErrorDuringLaunch = "Error during game launch {error}." gameErrorDuringLaunch = "Error during game launch {error}."
launchingGame = "Waiting for game window..." waintingLaunchingGame = "Waiting for game window..."
[js.landing.dlAsync.AthShield] [js.landing.dlAsync.AthShield]
distributionIdentityError = "Expected Identity from Distribution for {moduleName}: {moduleIdentity}." distributionIdentityError = "Expected Identity from Distribution for {moduleName}: {moduleIdentity}."