diff --git a/README.md b/README.md index ce117b3a..a84c35d4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

aventium softworks

-

Helios Launcher

+

Bigzbeul Launcher

(formerly Electron Launcher)
 diff --git a/app/app.ejs b/app/app.ejs index 75b5ea28..56db4699 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -1,7 +1,7 @@ - <%= lang('app.title') %> + Bigzbeul Launcher @@ -41,7 +41,6 @@
-
diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 8b239311..14edbc4c 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -2855,12 +2855,11 @@ input:checked + .toggleSwitchSlider:before { /* Logo image. */ #image_seal { - height: 70px; + height: 120px; width: auto; position: relative; - border: 2px solid white; + border: 0; box-sizing: border-box; - border-radius: 50%; } /* Logo container styles. */ @@ -3919,6 +3918,7 @@ input:checked + .toggleSwitchSlider:before { justify-content: center; width: 100%; height: calc(100% - 22px); + overflow: hidden; } /* Loading content container. */ @@ -3932,7 +3932,7 @@ input:checked + .toggleSwitchSlider:before { /* Spinner container. */ #loadSpinnerContainer { - position: relative; + position: absolute; display: flex; align-items: center; justify-content: center; @@ -3941,15 +3941,16 @@ input:checked + .toggleSwitchSlider:before { /* Stationary image for the spinner. */ #loadCenterImage { position: absolute; - width: 277px; + width: 577px; height: auto; + z-index: 600; } /* Rotating image for the spinner. */ #loadSpinnerImage { - width: 280px; + width: 2160px; height: auto; - z-index: 400; + z-index: 500; } /* Rotating animation for the spinner. */ @@ -3964,5 +3965,5 @@ input:checked + .toggleSwitchSlider:before { /* Class which is applied when the spinner image is spinning. */ .rotating { - animation: rotating 10s linear infinite; + animation: rotating 20s linear infinite; } \ No newline at end of file diff --git a/app/assets/images/LoadingSeal.png b/app/assets/images/LoadingSeal.png index afe2c4d4..d05520b2 100644 Binary files a/app/assets/images/LoadingSeal.png and b/app/assets/images/LoadingSeal.png differ diff --git a/app/assets/images/LoadingText.png b/app/assets/images/LoadingText.png deleted file mode 100644 index 5e55b332..00000000 Binary files a/app/assets/images/LoadingText.png and /dev/null differ diff --git a/app/assets/images/Logo.png b/app/assets/images/Logo.png new file mode 100644 index 00000000..d05520b2 Binary files /dev/null and b/app/assets/images/Logo.png differ diff --git a/app/assets/images/SealCircle.ico b/app/assets/images/SealCircle.ico index e37b95df..667598c3 100644 Binary files a/app/assets/images/SealCircle.ico and b/app/assets/images/SealCircle.ico differ diff --git a/app/assets/images/SealCircle.png b/app/assets/images/SealCircle.png index 9e21d08b..eb240a20 100644 Binary files a/app/assets/images/SealCircle.png and b/app/assets/images/SealCircle.png differ diff --git a/app/assets/images/backgrounds/0.jpg b/app/assets/images/backgrounds/0.jpg deleted file mode 100644 index 66a2c12a..00000000 Binary files a/app/assets/images/backgrounds/0.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/0.png b/app/assets/images/backgrounds/0.png new file mode 100644 index 00000000..d601f680 Binary files /dev/null and b/app/assets/images/backgrounds/0.png differ diff --git a/app/assets/images/backgrounds/1.jpg b/app/assets/images/backgrounds/1.jpg deleted file mode 100644 index e343cbe2..00000000 Binary files a/app/assets/images/backgrounds/1.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/1.png b/app/assets/images/backgrounds/1.png new file mode 100644 index 00000000..a3003d9d Binary files /dev/null and b/app/assets/images/backgrounds/1.png differ diff --git a/app/assets/images/backgrounds/2.jpg b/app/assets/images/backgrounds/2.jpg deleted file mode 100644 index 7a13e771..00000000 Binary files a/app/assets/images/backgrounds/2.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/2.png b/app/assets/images/backgrounds/2.png new file mode 100644 index 00000000..a97403aa Binary files /dev/null and b/app/assets/images/backgrounds/2.png differ diff --git a/app/assets/images/backgrounds/3.jpg b/app/assets/images/backgrounds/3.jpg deleted file mode 100644 index 5c7be569..00000000 Binary files a/app/assets/images/backgrounds/3.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/3.png b/app/assets/images/backgrounds/3.png new file mode 100644 index 00000000..6c7d9c74 Binary files /dev/null and b/app/assets/images/backgrounds/3.png differ diff --git a/app/assets/images/backgrounds/4.jpg b/app/assets/images/backgrounds/4.jpg deleted file mode 100644 index 1db7800e..00000000 Binary files a/app/assets/images/backgrounds/4.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/4.png b/app/assets/images/backgrounds/4.png new file mode 100644 index 00000000..ea8fd76f Binary files /dev/null and b/app/assets/images/backgrounds/4.png differ diff --git a/app/assets/images/backgrounds/5.jpg b/app/assets/images/backgrounds/5.jpg deleted file mode 100644 index beb4b148..00000000 Binary files a/app/assets/images/backgrounds/5.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/5.png b/app/assets/images/backgrounds/5.png new file mode 100644 index 00000000..fb051231 Binary files /dev/null and b/app/assets/images/backgrounds/5.png differ diff --git a/app/assets/images/backgrounds/6.jpg b/app/assets/images/backgrounds/6.jpg deleted file mode 100644 index acdaa73a..00000000 Binary files a/app/assets/images/backgrounds/6.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/7.jpg b/app/assets/images/backgrounds/7.jpg deleted file mode 100644 index cc48f72f..00000000 Binary files a/app/assets/images/backgrounds/7.jpg and /dev/null differ diff --git a/app/assets/images/minecraft.icns b/app/assets/images/minecraft.icns index 60ce69d7..fff2604d 100644 Binary files a/app/assets/images/minecraft.icns and b/app/assets/images/minecraft.icns differ diff --git a/app/assets/images/radial_background.png b/app/assets/images/radial_background.png new file mode 100644 index 00000000..309f6ec3 Binary files /dev/null and b/app/assets/images/radial_background.png differ diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 38f864fe..fab8f146 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -7,7 +7,7 @@ const logger = LoggerUtil.getLogger('ConfigManager') const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) -const dataPath = path.join(sysRoot, '.helioslauncher') +const dataPath = path.join(sysRoot, '.bigzbeullauncher') const launcherDir = require('@electron/remote').app.getPath('userData') diff --git a/app/assets/js/langloader.js b/app/assets/js/langloader.js index b1f13c96..4bd0e15d 100644 --- a/app/assets/js/langloader.js +++ b/app/assets/js/langloader.js @@ -36,7 +36,7 @@ exports.setupLanguage = function(){ // Load Language Files exports.loadLanguage('en_US') // Uncomment this when translations are ready - //exports.loadLanguage('xx_XX') + // exports.loadLanguage('fr_FR') // Load Custom Language File for Launcher Customizer exports.loadLanguage('_custom') diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 0e955621..7bbd6824 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -368,7 +368,7 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=HeliosLauncher') + args.push('-Xdock:name=BigzbeulLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 1a1c1768..530ad0f1 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -236,17 +236,17 @@ const refreshMojangStatuses = async function(){ } const refreshServerStatus = async (fade = false) => { - loggerLanding.info('Refreshing Server Status') + loggerLanding.info('Actualisation du statut du serveur') const serv = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer()) - let pLabel = Lang.queryJS('landing.serverStatus.server') - let pVal = Lang.queryJS('landing.serverStatus.offline') + let pLabel = 'SERVEUR' + let pVal = 'HORS-LIGNE' try { const servStat = await getServerStatus(47, serv.hostname, serv.port) console.log(servStat) - pLabel = Lang.queryJS('landing.serverStatus.players') + pLabel = 'JOUEURS' pVal = servStat.players.online + '/' + servStat.players.max } catch (err) { diff --git a/app/assets/js/scripts/uibinder.js b/app/assets/js/scripts/uibinder.js index 5fe79df5..29e65862 100644 --- a/app/assets/js/scripts/uibinder.js +++ b/app/assets/js/scripts/uibinder.js @@ -69,7 +69,7 @@ async function showMainUI(data){ refreshServerStatus() setTimeout(() => { document.getElementById('frameBar').style.backgroundColor = 'rgba(0, 0, 0, 0.5)' - document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.jpg')` + document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.png')` $('#main').show() const isLoggedIn = Object.keys(ConfigManager.getAuthAccounts()).length > 0 @@ -100,9 +100,9 @@ async function showMainUI(data){ $('#loadingContainer').fadeOut(500, () => { $('#loadSpinnerImage').removeClass('rotating') }) - }, 250) + }, 500) - }, 750) + }, 1500) // Disable tabbing to the news container. initNews().then(() => { $('#newsContainer *').attr('tabindex', '-1') diff --git a/app/assets/lang/fr_FR.json b/app/assets/lang/fr_FR.json new file mode 100644 index 00000000..5984fc3c --- /dev/null +++ b/app/assets/lang/fr_FR.json @@ -0,0 +1,49 @@ +{ + "html": { + "avatarOverlay": "Modifier" + }, + "js": { + "login": { + "error": { + "invalidValue": "* Valeur invalide", + "requiredValue": "* Champ obligatoire", + "userMigrated": { + "title": "Erreur lors de la connexion :
Identifiants non valides", + "desc": "Vous avez tenté de vous connecter avec un compte migré. Réessayez en utilisant l'adresse e-mail du compte comme nom d'utilisateur." + }, + "invalidCredentials": { + "title": "Erreur lors de la connexion :
Identifiants incorrects", + "desc": "L'e-mail ou le mot de passe que vous avez saisi est incorrect. Veuillez réessayer." + }, + "rateLimit": { + "title": "Erreur lors de la connexion :
Trop de tentatives", + "desc": "Il y a eu trop de tentatives de connexion avec ce compte récemment. Veuillez réessayer plus tard." + }, + "noInternet": { + "title": "Erreur lors de la connexion :
Pas de connexion Internet", + "desc": "Vous devez être connecté à Internet pour vous connecter. Veuillez vous connecter et réessayer." + }, + "authDown": { + "title": "Erreur lors de la connexion :
Serveur d'authentification hors ligne", + "desc": "Le serveur d'authentification de Mojang est actuellement hors ligne ou inaccessible. Veuillez patienter un peu et réessayer. Vous pouvez vérifier l'état du serveur sur le portail d'aide de Mojang." + }, + "notPaid": { + "title": "Erreur lors de la connexion :
Jeu non acheté", + "desc": "Le compte avec lequel vous essayez de vous connecter n'a pas acheté une copie de Minecraft.
Vous pouvez acheter une copie sur Minecraft.net." + }, + "unknown": { + "title": "Erreur lors de la connexion :
Erreur inconnue" + } + }, + "login": "CONNEXION", + "loggingIn": "CONNEXION EN COURS", + "success": "SUCCÈS", + "tryAgain": "Réessayer" + }, + "landing": { + "launch": { + "pleaseWait": "Veuillez patienter..." + } + } + } +} \ No newline at end of file diff --git a/app/frame.ejs b/app/frame.ejs index 1151f915..98da2065 100644 --- a/app/frame.ejs +++ b/app/frame.ejs @@ -13,7 +13,7 @@ <% } else{ %>
- <%= lang('app.title') %> + Bigzbeul Launcher
+
@@ -23,14 +23,14 @@ -
<%- lang('landing.settingsTooltip') %>
+
Paramètres
- + @@ -40,45 +40,7 @@
- - - - - - - -
-
- - - - - - - - - - - - - - - - - - -
-
- - - - - - - -
-
- + @@ -96,12 +58,12 @@
- <%- lang('landing.serverStatus') %> - <%- lang('landing.serverStatusPlaceholder') %> + SERVEUR + HORS-LIGNE
- <%- lang('landing.mojangStatus') %> + STATUT MOJANG •
<%- lang('landing.mojangStatusTooltipTitle') %>
@@ -110,7 +72,7 @@
-
<%- lang('landing.mojangStatusNETitle') %>
+
Non Essentiels
@@ -122,28 +84,13 @@
-
-
- -
-
- <%- lang('landing.newsErrorLoadSpan') %> + Chargement des News..
diff --git a/app/login.ejs b/app/login.ejs index 2da80729..c799e7be 100644 --- a/app/login.ejs +++ b/app/login.ejs @@ -2,7 +2,7 @@
@@ -15,8 +15,8 @@ - <%- lang('login.loginEmailError') %> - + * Valeur invalide +
@@ -24,16 +24,16 @@ - <%- lang('login.loginPasswordError') %> - + * Requis +
- <%- lang('login.loginForgotPasswordText') %> + mot de passe oublié?
@@ -54,10 +54,10 @@
- <%- lang('login.loginNeedAccountText') %> + Créer un compte -

<%- lang('login.loginPasswordDisclaimer1') %>

-

<%- lang('login.loginPasswordDisclaimer2', { appName: lang('app.title') }) %>

+

Votre mot de passe est directement envoyé à Mojang est n'est pas stocké.

+

Le Bigzbeul n'est pas affilié avec Mojang AB.

diff --git a/app/settings.ejs b/app/settings.ejs index 3fda82a2..8d328bf7 100644 --- a/app/settings.ejs +++ b/app/settings.ejs @@ -2,21 +2,21 @@
- <%- lang('settings.navHeaderText') %> + Paramètres
- - - - - + + + + +
- - + +
- +
@@ -25,8 +25,8 @@
- <%- lang('settings.tabAccountHeaderText') %> - <%- lang('settings.tabAccountHeaderDesc') %> + Paramètres du compte + Ajouter de nouveaux comptes et gérer les existants.
@@ -40,7 +40,7 @@ <%- lang('settings.microsoftAccount') %>
- +
@@ -60,7 +60,7 @@ <%- lang('settings.mojangAccount') %>
- +
@@ -71,11 +71,11 @@