From 21167abe2ce3d76d794fc0a56999115efc8b9ce3 Mon Sep 17 00:00:00 2001 From: Luc'HACK Date: Mon, 4 Jul 2022 00:31:12 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=E2=9C=92=EF=B8=8F=20Add=20CSS=20for=20code?= =?UTF-8?q?=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/css/launcher.css | 176 +++++++++++++++++++++++++++++++++++- 1 file changed, 174 insertions(+), 2 deletions(-) diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 67d0d12..8ae9b94 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -1274,7 +1274,7 @@ body, button { } .settingsFieldDesc { font-size: 12px; - color: rgba(255, 255, 255, .95); + color: gray; margin-top: 5px; } .settingsDivider { @@ -1428,13 +1428,185 @@ input:checked + .toggleSwitchSlider:before { .settingsFileSelDesc { font-size: 10px; margin: 20px 0px; - color: lightgrey; + color: gray; width: 89%; } .settingsFileSelDesc strong { font-family: 'Avenir Medium'; } +/* Server code */ +.settingsServerCodeContainer { + display: flex; + flex-direction: column; + border-bottom: 1px solid rgba(255, 255, 255, 0.50); + margin-bottom: 20px; + margin-top: 20px; + width: 75%; +} + +/* Server Code title. */ +.settingsServerCodesTitle { + margin-bottom: 10px; + font-size: 14px; + font-family: 'Avenir Medium'; +} + +/* Wrapper container for the actionable elements. */ +.settingsServerCodeActions { + display: flex; + width: 60%; +} + +/* Enabled text field which stores the secret code if available. */ +.settingsInputServerCodeVal { + border-radius: 0px 3px 3px 0px !important; + width: 100%; + padding: 5px 10px; + font-size: 12px; +} + +/* File selector icon settings. */ +.settingsServerCodeIcon { + display: flex; + align-items: center; + background: rgba(126, 126, 126, 0.57); + border-radius: 3px 0px 0px 3px; + padding: 5px; + transition: 0.25s ease; +} +.settingsServerCodeSVG { + width: 20px; + height: 20px; + fill: white; +} + +.settingsInputServerCodeButton { + border: 0px; + border-radius: 3px 3px 3px 3px; + font-size: 12px; + padding: 0px 5px; + margin-left: 10px; + cursor: pointer; + background: rgba(126, 126, 126, 0.57); + transition: 0.25s ease; + white-space: nowrap; + outline: none; +} +.settingsInputServerCodeButton:hover, +.settingInputServerCodeButton:focus { + text-shadow: 0px 0px 20px white; +} +.settingsInputServerCodeButton:active { + text-shadow: 0px 0px 20px rgba(255, 255, 255, 0.75); + color: rgba(255, 255, 255, 0.75); +} + +/* Description for the file selector. */ +.settingsServerCodesDesc { + margin: 20px 0px; + color: grey; + font-size: 12px; + width: 90%; +} + + +.settingsServerCodesDesc strong { + font-family: 'Avenir Medium'; +} + +#settingsServerCodesListContent { + font-size: 16px; + background: rgba(0, 0, 0, 0.25); + border-radius: 3px; + color: white; + margin-top: 10px; +} + +.settingsServerCode { + padding: 8px 0px 8px 8px; +} + +/* Main content container for server code element information. */ +.settingsServerCodeContent { + display: flex; + align-items: center; + justify-content: space-between; + transition: opacity 0.25s ease; +} + +/* Wrapper container for the left side of a server code element. */ +.settingsServerCodeMainWrapper { + display: flex; + align-items: center; +} + +.settingsServerCodeRemoveWrapper { + margin-right: 25px; +} + +/* Server code valid/invalid status. */ +.settingsServerCodeStatus { + width: 7px; + height: 7px; + border-radius: 50%; + background-color: #c32625; + margin-right: 15px; + transition: 0.25s ease; +} + +.settingsServerCode[valid] > .settingsServerCodeContent > .settingsServerCodeMainWrapper > .settingsServerCodeStatus { + background-color: #4ddd19; +} + +/* Mod details container. */ +.settingsServerCodeDetails { + display: flex; + flex-direction: column; +} + +.settingsServerCodeName { + display: flex; + flex-direction: column; + font-size: 16px; + font-weight: bold; +} + +.settingsServerCodeServerNamesContent { + max-width: 650px; +} + +.settingsServerCodeServerName { + margin-right: 35px; + font-size: 14px; +} + +.settingsServerCode:not([valid]) > .settingsServerCodeContent > .settingsServerCodeMainWrapper > .settingsServerCodeDetails > .settingsServerCodeServerNamesContent > .settingsServerCodeServerName { + color: red; +} + +/* Button to remove drop-in mods. */ +.settingsServerCodeRemoveButton { + background: none; + border: none; + font-size: 14px; + text-align: right; + padding: 0px; + color: grey; + cursor: pointer; + outline: none; + transition: 0.25s ease; + font-weight: bold; +} + +.settingsServerCodeRemoveButton:hover, +.settingsServerCodeRemoveButton:focus { + color: red; +} +.settingsServerCodeRemoveButton:active { + color: #9b1f1f; +} + /* * * * Settings View (Account Tab) * * */ From 4bb0111ac2981664c87f569c054932e809dfd5f3 Mon Sep 17 00:00:00 2001 From: Luc'HACK Date: Mon, 4 Jul 2022 00:32:00 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Add=20code=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/settings.ejs | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/app/settings.ejs b/app/settings.ejs index 76b0bf3..51beb7b 100644 --- a/app/settings.ejs +++ b/app/settings.ejs @@ -7,10 +7,11 @@
+ +
-
@@ -116,6 +117,18 @@
+
+
+ Ouvrir la console au lancement + Cela ouvre la DevTool Console au lancement et vous permet de visualiser le journal du client en temps réel. +
+
+ +
+
-
The recommended minimum RAM is 3 gigabytes. Setting the minimum and maximum values to the same value may reduce lag.
+
The recommended minimum RAM is 4GB. Setting the minimum and maximum values to the same value may reduce lag. In order to use the memory you have allocated, it must be free and available in your system. Allocating all of your total memory is not recommended.
@@ -276,6 +289,18 @@
+
+
+ Activez l'intégration de Discord + Cette option permet au lanceur de contrôler votre présence sur Discord. Si vous fermez le lanceur à tout moment, cette fonctionnalité ne fonctionnera plus. Ce paramètre nécessite de relancer le launcher. +
+
+ +
+
Répertoire des données
@@ -295,6 +320,24 @@
Tous les fichiers de jeu et les installations Java locales seront stockés dans le répertoire data.
Les captures d'écran et les sauvegardes du monde sont stockées dans le dossier instance de la configuration de serveur correspondante.
+
+
Vos codes de serveur
+
+
+
+ + + +
+ + +
+
+
+ +
+
Spécifiez les codes de serveur ici pour accorder l'accès à des serveurs cachés qui ne seraient pas disponibles pour tous les utilisateurs par défaut.
+
+ + ` + } + + document.getElementById('settingsServerCodesListContent').innerHTML = servCodes + + /* Server Names List */ + for(let ele of document.getElementsByClassName('settingsServerCodeServerNamesContent')){ + servNames = '' + const code = ele.getAttribute('code') + const servs = DistroManager.getDistribution().getServersFromCode(code) + const valid = servs && servs.length + loggerSettings.log('valid: ' + valid) + if(valid){ + for(let serv of servs){ + loggerSettings.log('server: ' + serv.getName()) + servNames += + ` + ${serv.getName()} + ` + } + } else { + servNames = + ` + Code invalide + ` + } + + ele.innerHTML = servNames + } +} + /** * Bind the remove button for each loaded drop-in mod. */ @@ -1543,6 +1646,7 @@ function prepareSettings(first = false) { initSettingsValues() prepareAccountsTab() prepareJavaTab() + prepareLauncherTab() prepareAboutTab() } From 37471981147b1a2d5fe1934dad752fd1e8b55343 Mon Sep 17 00:00:00 2001 From: Luc'HACK Date: Mon, 4 Jul 2022 16:42:11 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=E2=9C=92=EF=B8=8F=20Change=20a=20little=20?= =?UTF-8?q?the=20display=20style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/css/launcher.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 8ae9b94..b895cd6 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -1568,7 +1568,7 @@ input:checked + .toggleSwitchSlider:before { .settingsServerCodeName { display: flex; flex-direction: column; - font-size: 16px; + font-size: 14px; font-weight: bold; } @@ -1578,7 +1578,7 @@ input:checked + .toggleSwitchSlider:before { .settingsServerCodeServerName { margin-right: 35px; - font-size: 14px; + font-size: 12px; } .settingsServerCode:not([valid]) > .settingsServerCodeContent > .settingsServerCodeMainWrapper > .settingsServerCodeDetails > .settingsServerCodeServerNamesContent > .settingsServerCodeServerName {