From 3790b52d0d67934586bd7bdd299aa54c9d1eca15 Mon Sep 17 00:00:00 2001 From: Sandro642 Date: Thu, 24 Oct 2024 16:05:21 +0200 Subject: [PATCH 1/3] Update landing.js dependencies and add new features Replaced 'path' with 'fs' module and removed unused 'Lang'. Added support for the new HeliosLauncher version and implemented a whitelist for mods. Fixed a typo in the logging message. --- ajouts/version code final/landing.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ajouts/version code final/landing.js b/ajouts/version code final/landing.js index faea5e02..9ddc8447 100644 --- a/ajouts/version code final/landing.js +++ b/ajouts/version code final/landing.js @@ -30,9 +30,8 @@ const { // Internal Requirements const DiscordWrapper = require('./assets/js/discordwrapper') const ProcessBuilder = require('./assets/js/processbuilder') -const Lang = require('./app/assets/js/langloader') const dataPath = require('./app/assets/configmanager') -const path = require('path') +const fs = require('fs') // Launch Elements const launch_content = document.getElementById('launch_content') @@ -442,22 +441,23 @@ async function downloadJava(effectiveJavaOptions, launchAfter = true) { /** * @Name dlAsync Function - * @async - * @param {boolean} login * @returns {Promise} * * @author Sandro642 * @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 - * @Bug découvert : 0 + * @Reviewed on XX.XX.2024 expires on 01.01.2025 + * @Bugs discovered: 0 * @Athena's Shield * @Sandro642 */ + // ▄▄▄ ▄▄▄█████▓ ██░ ██ ▓█████ ███▄ █ ▄▄▄ ██████ ██████ ██░ ██ ██▓▓█████ ██▓ ▓█████▄ // ▒████▄ ▓ ██▒ ▓▒▓██░ ██▒▓█ ▀ ██ ▀█ █ ▒████▄ ▒██ ▒ ▒██ ▒ ▓██░ ██▒▓██▒▓█ ▀ ▓██▒ ▒██▀ ██▌ // ▒██ ▀█▄ ▒ ▓██░ ▒░▒██▀▀██░▒███ ▓██ ▀█ ██▒▒██ ▀█▄ ░ ▓██▄ ░ ▓██▄ ▒██▀▀██░▒██▒▒███ ▒██░ ░██ █▌ @@ -742,7 +742,7 @@ async function dlAsync(login = true) { }) setTimeout(() => { - loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.launchingGame')) + loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.waintingLaunchingGame')) }, MIN_LINGER) } } From 85cb73363aa1e78b31fc7cb3a1e26c33ed451233 Mon Sep 17 00:00:00 2001 From: Sandro642 Date: Thu, 24 Oct 2024 16:08:01 +0200 Subject: [PATCH 2/3] Fix typo in game launch message Corrected the typo from "launchingGame" to "waintingLaunchingGame" in the en_US language file. This ensures the message displayed to users is accurate and free of errors. --- app/assets/lang/en_US.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/lang/en_US.toml b/app/assets/lang/en_US.toml index d6251fca..db4e9c71 100644 --- a/app/assets/lang/en_US.toml +++ b/app/assets/lang/en_US.toml @@ -213,7 +213,7 @@ accountToProcessBuilder = "Sending selected account ({userDisplayName}) to Proce gameError = "Game error: {data}" gameExited = "Game process exited with code {code}." gameErrorDuringLaunch = "Error during game launch {error}." -launchingGame = "Waiting for game window..." +waintingLaunchingGame = "Waiting for game window..." [js.landing.dlAsync.AthShield] distributionIdentityError = "Expected Identity from Distribution for {moduleName}: {moduleIdentity}." From 7073c2744b63b347b1fbb3f7a5a2703a55f0af26 Mon Sep 17 00:00:00 2001 From: Sandro642 Date: Thu, 24 Oct 2024 16:08:15 +0200 Subject: [PATCH 3/3] Add mod whitelist and new HeliosLauncher support Implemented a whitelist for mods and added support for the new version of HeliosLauncher. Also corrected a language key for launch information logging. --- ajouts/version code final/dlAsync.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ajouts/version code final/dlAsync.js b/ajouts/version code final/dlAsync.js index 283db1db..ae2a2cfb 100644 --- a/ajouts/version code final/dlAsync.js +++ b/ajouts/version code final/dlAsync.js @@ -1,21 +1,22 @@ /** * @Name dlAsync Function - * @async - * @param {boolean} login * @returns {Promise} * * @author Sandro642 * @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 - * @Bug découvert : 0 + * @Reviewed on XX.XX.2024 expires on 01.01.2025 + * @Bugs discovered: 0 * @Athena's Shield * @Sandro642 */ + // ▄▄▄ ▄▄▄█████▓ ██░ ██ ▓█████ ███▄ █ ▄▄▄ ██████ ██████ ██░ ██ ██▓▓█████ ██▓ ▓█████▄ // ▒████▄ ▓ ██▒ ▓▒▓██░ ██▒▓█ ▀ ██ ▀█ █ ▒████▄ ▒██ ▒ ▒██ ▒ ▓██░ ██▒▓██▒▓█ ▀ ▓██▒ ▒██▀ ██▌ // ▒██ ▀█▄ ▒ ▓██░ ▒░▒██▀▀██░▒███ ▓██ ▀█ ██▒▒██ ▀█▄ ░ ▓██▄ ░ ▓██▄ ▒██▀▀██░▒██▒▒███ ▒██░ ░██ █▌ @@ -300,7 +301,7 @@ async function dlAsync(login = true) { }) setTimeout(() => { - loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.launchingGame')) + loggerLaunchSuite.info(Lang.queryJS('landing.dlAsync.waintingLaunchingGame')) }, MIN_LINGER) } } \ No newline at end of file