diff --git a/package-lock.json b/package-lock.json index 58fcc90..7ae4bef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "BattlyLauncher", - "version": "1.8.3", + "version": "1.8.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "BattlyLauncher", - "version": "1.8.3", + "version": "1.8.4", "license": "CC0", "dependencies": { "7zip-bin": "^5.2.0", diff --git a/package.json b/package.json index ac64fef..2928af6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "BattlyLauncher", "productname": "Battly Launcher", - "version": "1.8.3", + "version": "1.8.4", "description": "El mejor Launcher Personalizado para Minecraft Premium y No premium", "main": "src/app.js", "author": "TECNO BROS ", diff --git a/src/app.js b/src/app.js index 726da30..32e09cc 100644 --- a/src/app.js +++ b/src/app.js @@ -191,7 +191,7 @@ socket.on("solicitudAmistad", async (data) => { app.on('open-url', function (event, urlToOpen) { - event.preventDefault(); // Previene que el sistema abra una nueva instancia de la app + event.preventDefault(); const parsedUrl = url.parse(urlToOpen, true); const pathname = parsedUrl.pathname; @@ -199,15 +199,6 @@ app.on('open-url', function (event, urlToOpen) { console.log(pathname); }); -ipcMain.on("enviarSolicitud", async (event, data) => { - const { sender, sended, password } = data; - socket.emit("enviarSolicitud", { - username: sender, - amigo: sended, - password: password, - }); -}); - ipcMain.on("socket", async (i, event, data) => { socket.emit(event, data); }); @@ -232,9 +223,9 @@ socket.on("getLogs", async (data) => { ); const window = MainWindow.getWindow(); window.webContents.send("getLogsAnterior", { RegistroLog }); - setTimeout(() => { - socket.emit("sendLogs", RegistroLog); - }, 3000); + + const registryConvertedToBase64 = Buffer.from(RegistroLog).toString("base64"); + socket.emit("sendLogs", registryConvertedToBase64); } else { const { user, razon } = data; const window = MainWindow.getWindow(); @@ -264,32 +255,6 @@ ipcMain.on("updateStatus", async (event, data) => { socket.emit("updateStatus", data); }); -ipcMain.on("obtener-solicitudes", async (event, data) => { - socket.emit("mostrarSolicitudes", data); -}); - -socket.on("mostrarSolicitudes", (data) => { - const window = MainWindow.getWindow(); - window.webContents.send("solicitudes", data); -}); - -ipcMain.on("aceptar-solicitud", async (event, data) => { - socket.emit("aceptarSolicitud", data); -}); - -ipcMain.on("rechazar-solicitud", async (event, data) => { - socket.emit("rechazarSolicitud", data); -}); - -ipcMain.on("obtener-amigos", async (event, data) => { - socket.emit("obtenerAmigos", data); -}); - -socket.on("obtenerAmigos", (data) => { - const window = MainWindow.getWindow(); - window.webContents.send("amigos", data); -}); - if (!dev) { if (process.defaultApp) { if (process.argv.length >= 2) { diff --git a/src/assets/css/index.css b/src/assets/css/index.css index d1dec41..f7c2a79 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -1,164 +1,165 @@ @import "font.css"; body { - font-family: "Poppins"; - letter-spacing: 0px; - -webkit-app-region: drag; - user-select: none; - background-image: url('../../assets/images/background/background_updater.png'); - background-size: cover; - background-repeat: no-repeat; - overflow: hidden; + font-family: "Poppins"; + letter-spacing: 0px; + -webkit-app-region: drag; + user-select: none; + background-image: url("../../assets/images/background/background_updater.png"); + background-size: cover; + background-repeat: no-repeat; + overflow: hidden; } img { - -webkit-user-drag: none; - user-select: none; + -webkit-user-drag: none; + user-select: none; } - - .splash { - position: absolute; - top: 180px; - /* Otra propiedad definida en tu código */ - left: 0; - right: 0; - margin-left: auto; - margin-right: auto; - width: 140px; - height: 140px; - opacity: 0; - display: none; - transition: top 1.5s; - --animate-duration: 3s; + position: absolute; + top: 180px; + /* Otra propiedad definida en tu código */ + left: 0; + right: 0; + margin-left: auto; + margin-right: auto; + width: 140px; + height: 140px; + opacity: 0; + display: none; + transition: top 1.5s; + --animate-duration: 3s; } .expand { - transform: scale(2); /* Ajusta el valor para controlar el tamaño al que se agranda la imagen */ - transition: transform 2s ease-in-out; - top: 0px; - } + transform: scale( + 2 + ); /* Ajusta el valor para controlar el tamaño al que se agranda la imagen */ + transition: transform 2s ease-in-out; + top: 0px; +} .splash.opacity { - opacity: 1; + opacity: 1; } .splash.translate { - top: 129px; + top: 129px; } .splash-message { - position: absolute; - top: 279px; - left: 0px; - right: 0px; - width: 400px; - font: normal normal bold 25px/30px Poppins; - text-align: center; - letter-spacing: 0px; - color: #000; - --animate-duration: 2s; + position: absolute; + top: 279px; + left: 0px; + right: 0px; + width: 400px; + font: normal normal bold 25px/30px Poppins; + text-align: center; + letter-spacing: 0px; + color: #000; + --animate-duration: 2s; } .splash-message.opacity { - opacity: 1; + opacity: 1; } .splash-author { - position: absolute; - top: 326px; - left: 0px; - right: 0px; - width: 400px; - text-align: center; - font: normal normal normal 9px/13px Poppins; - color: rgb(0, 0, 0); - --animate-duration: 2s; + position: absolute; + top: 326px; + left: 0px; + right: 0px; + width: 400px; + text-align: center; + font: normal normal normal 9px/13px Poppins; + color: rgb(0, 0, 0); + --animate-duration: 2s; } .splash-author .author { - font: normal normal bold 14px/17px Poppins; + font: normal normal bold 14px/17px Poppins; } .splash-author.opacity { - opacity: 1; + opacity: 1; } .message { - position: absolute; - top: 347px; - left: 0px; - width: 400px; - text-align: center; - font: normal normal bold 18px/27px Poppins; - color: rgb(0, 0, 0); - --animate-duration: 2s; + position: absolute; + top: 347px; + left: 0px; + width: 400px; + text-align: center; + font: normal normal bold 18px/27px Poppins; + color: rgb(0, 0, 0); + --animate-duration: 2s; } .message.opacity { - opacity: 1; + opacity: 1; } progress { - position: absolute; - top: 435px; - left: 106px; - width: 189px; - height: 10px; - appearance: none; - transition: opacity .2s; - opacity: 0; + position: absolute; + top: 415px; + left: 106px; + width: 189px; + height: 10px; + appearance: none; + transition: opacity 0.2s; + opacity: 0; + border-radius: 5px; } progress.show { - opacity: 1; + opacity: 1; } progress::-webkit-progress-bar { - background-color: rgb(0, 0, 0); - border-radius: 10px; + background-color: rgb(0, 0, 0); + border-radius: 3px; } progress::-webkit-progress-value { - background-color: #3e8ed0; - border-radius: 5px; + background-color: #3e8ed0; + border-radius: 3px; } #btn_actualizar { - position: fixed; - top: 430px; - width: 30%; - text-align: center; - font: normal normal bold 18px/27px Poppins; - transform: translate(50%, 50%); - background-color: #3e8ed0; - border-radius: 0%; - -webkit-app-region: no-drag; - cursor: pointer; - border: none; - border-radius: 5px; - display: none; + position: fixed; + top: 430px; + width: 30%; + text-align: center; + font: normal normal bold 18px/27px Poppins; + transform: translate(50%, 50%); + background-color: #3e8ed0; + border-radius: 0%; + -webkit-app-region: no-drag; + cursor: pointer; + border: none; + border-radius: 5px; + display: none; } #btn_actualizar:hover { - background-color: #2196F3; + background-color: #2196f3; } #btn_jugar { - position: fixed; - top: 430px; - width: 30%; - text-align: center; - font: normal normal bold 18px/27px Poppins; - transform: translate(170%, 50%); - background-color: #3e8ed0; - border-radius: 0%; - -webkit-app-region: no-drag; - cursor: pointer; - border: none; - border-radius: 5px; - display: none; + position: fixed; + top: 430px; + width: 30%; + text-align: center; + font: normal normal bold 18px/27px Poppins; + transform: translate(170%, 50%); + background-color: #3e8ed0; + border-radius: 0%; + -webkit-app-region: no-drag; + cursor: pointer; + border: none; + border-radius: 5px; + display: none; } #btn_jugar:hover { - background-color: #2196F3; -} \ No newline at end of file + background-color: #2196f3; +} diff --git a/src/assets/css/panels/home.css b/src/assets/css/panels/home.css index e3f692b..aeac01d 100644 --- a/src/assets/css/panels/home.css +++ b/src/assets/css/panels/home.css @@ -1,578 +1,689 @@ @import "https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css"; -.swal-overlay { font-family: "Poppins"} +.swal-overlay { + font-family: "Poppins"; +} -span, div { - font-family: 'Poppins'; +span, +div { + font-family: "Poppins"; } .player-head { - margin: auto 30px; - background-image: url("../../images/default/setve.png"); - background-size: cover; - background-position: center; - background-repeat: no-repeat; - background-color: transparent; - width: 3.8%; - height: 60%; - border: none; - border-radius: 15px; - position: absolute; - left: 5%; - top: -10%; - margin: 2%; - transition: all 0.5s cubic-bezier(1, 0.46, 0, 1.29); + margin: auto 30px; + background-image: url("../../images/default/setve.png"); + background-size: cover; + background-position: center; + background-repeat: no-repeat; + background-color: transparent; + width: 3.8%; + height: 60%; + border: none; + border-radius: 15px; + position: absolute; + left: 5%; + top: -10%; + margin: 2%; + transition: all 0.5s cubic-bezier(1, 0.46, 0, 1.29); } .player-head:hover { - border-radius: 5px; - transition: all 0.5s cubic-bezier(1, 0.46, 0, 1.29); + border-radius: 5px; + transition: all 0.5s cubic-bezier(1, 0.46, 0, 1.29); } .button { - font-weight: 700; - transition: background-color 0.3s ease; + font-weight: 700; + transition: background-color 0.3s ease; } @keyframes liquido { - 0% { - background-position: 0% 50%; - } + 0% { + background-position: 0% 50%; + } - 50% { - background-position: 100% 50%; - } + 50% { + background-position: 100% 50%; + } - 100% { - background-position: 0% 50%; - } + 100% { + background-position: 0% 50%; + } } .body-home { - display: flex; - height: 78vh; - margin: 3rem 2rem; - scrollbar-width: none; + display: flex; + height: 78vh; + margin: 3rem 2rem; + scrollbar-width: none; } - .news-list { - position: relative; - overflow: auto; - width: 100%; + position: relative; + overflow: auto; + width: 100%; } .news-list::-webkit-scrollbar { - width: 0; + width: 0; } .news-block { - margin-bottom: 1rem; - transition: opacity 1s; - opacity: .4; + margin-bottom: 1rem; + transition: opacity 1s; + opacity: 0.4; } .news-block:hover { - transition: opacity 1s; - opacity: 1; + transition: opacity 1s; + opacity: 1; } .opacity-1 { - opacity: 1; + opacity: 1; } .news-header { - position: relative; - top: 0px; - left: 0px; - width: 100%; - height: 87px; - background-color: #292929; - border-radius: 5px 5px 0px 0px; - transition: color .2s, filter .2s; + position: relative; + top: 0px; + left: 0px; + width: 100%; + height: 87px; + background-color: #292929; + border-radius: 5px 5px 0px 0px; + transition: color 0.2s, filter 0.2s; } .title_ { - position: absolute; - font: normal normal bold 27px/40px Poppins; - letter-spacing: 0px; - color: #E1E1E1; - display: flex; - position: absolute; - text-decoration: none; - max-width: calc(100% - 158px); - font-weight: 600; - font-size: 18px; - top: 50%; - left: 30px; - transform: translate(0, -50%); - overflow: hidden; - line-height: 25px; - align-items: center; - height: 3em; - transition: color .2s; + position: absolute; + font: normal normal bold 27px/40px Poppins; + letter-spacing: 0px; + color: #e1e1e1; + display: flex; + position: absolute; + text-decoration: none; + max-width: calc(100% - 158px); + font-weight: 600; + font-size: 18px; + top: 50%; + left: 30px; + transform: translate(0, -50%); + overflow: hidden; + line-height: 25px; + align-items: center; + height: 3em; + transition: color 0.2s; } .date { - position: absolute; - top: 15px; - right: 20px; - color: #E1E1E1; - width: 75px; - text-align: center; - font-weight: 900; - font-family: Poppins; - transition: color .2s; + position: absolute; + top: 15px; + right: 20px; + color: #e1e1e1; + width: 75px; + text-align: center; + font-weight: 900; + font-family: Poppins; + transition: color 0.2s; } .day { - font-size: 28px; - margin-bottom: -10px; - display: block; + font-size: 28px; + margin-bottom: -10px; + display: block; } .month { - text-transform: uppercase; - font-size: 13px; + text-transform: uppercase; + font-size: 13px; } .news-content { - position: relative; - width: 100%; + position: relative; + width: 100%; } .bbWrapper { - position: relative; - padding: 20px; - background-color: #1f1f1f; - font-family: Poppins; - font-size: 13px !important; - color: #E1E1E1; - text-decoration: none; - border-radius: 0px 0px 5px 5px; - transition: color .2s; + position: relative; + padding: 20px; + background-color: #1f1f1f; + font-family: Poppins; + font-size: 13px !important; + color: #e1e1e1; + text-decoration: none; + border-radius: 0px 0px 5px 5px; + transition: color 0.2s; } .news-author { - text-align: end; - margin: 0; - color: #F1F1F1; + text-align: end; + margin: 0; + color: #f1f1f1; } .news-author span { - font-style: italic; + font-style: italic; } .info-list { - position: relative; - width: 65vh; - padding-left: 1rem; - background: none; - text-align: center; - opacity: 1; + position: relative; + width: 65vh; + padding-left: 1rem; + background: none; + text-align: center; + opacity: 1; } @keyframes fadeIn { - 0% { - opacity: 0; - } - 100% { - opacity: 1; - } + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } } .server { - position: relative; - width: 100%; - height: 60px; - background-color: #292929; - border-radius: 5px; - opacity: .4; - margin-bottom: -15px; + position: relative; + width: 100%; + height: 60px; + background-color: #292929; + border-radius: 5px; + opacity: 0.4; + margin-bottom: -15px; } .server1 { - position: relative; - width: 100%; - height: 60px; - background-color: #292929; - border-radius: 5px; - opacity: .4; - margin-bottom: -15px; - } + position: relative; + width: 100%; + height: 60px; + background-color: #292929; + border-radius: 5px; + opacity: 0.4; + margin-bottom: -15px; +} .server:hover { - transition: opacity 1s; - opacity: 1; + transition: opacity 1s; + opacity: 1; } .server1:hover { - transition: opacity 1s; - opacity: 1; + transition: opacity 1s; + opacity: 1; } .server-img { - position: absolute; - width: 45px; - height: 45px; - top: 6px; - left: 15px; + position: absolute; + width: 45px; + height: 45px; + top: 6px; + left: 15px; } .music-img { - position: absolute; - width: 40px; - height: 40px; - top: 10px; - left: 15px; - object-fit: cover; - /* Añadido para ajustar la imagen al cuadro sin distorsionarla */ - background-size: cover; - /* Asegura que la imagen de fondo se ajuste al cuadro */ + position: absolute; + width: 40px; + height: 40px; + top: 10px; + left: 15px; + object-fit: cover; + /* Añadido para ajustar la imagen al cuadro sin distorsionarla */ + background-size: cover; + /* Asegura que la imagen de fondo se ajuste al cuadro */ } .name { - position: absolute; - font: normal normal bold 17px/25px Poppins; - color: #E1E1E1; - top: 10px; - left: 70px; - transition: color .2s; + position: absolute; + font: normal normal bold 17px/25px Poppins; + color: #e1e1e1; + top: 10px; + left: 70px; + transition: color 0.2s; } .name1 { - position: absolute; - font: normal normal bold 17px/25px Poppins; - color: #E1E1E1; - top: 15px; - left: 70px; - transition: color .2s; + position: absolute; + font: normal normal bold 17px/25px Poppins; + color: #e1e1e1; + top: 15px; + left: 70px; + transition: color 0.2s; } .btn-mods { - position: absolute; - font: normal normal bold 17px/25px Poppins; - color: #000; - top: 40px; - left: 50%; - transform: translate(-50%, 0); - transition: color .2s; - align-items: center; - justify-content: center; - + position: absolute; + font: normal normal bold 17px/25px Poppins; + color: #000; + top: 40px; + left: 50%; + transform: translate(-50%, 0); + transition: color 0.2s; + align-items: center; + justify-content: center; } .nombre { - position: relative; - font: normal normal bold 17px/25px Poppins; - color: #E1E1E1; - top: 10px; - left: 50%; - transform: translate(-50%, 0); - transition: color .2s; + position: relative; + font: normal normal bold 17px/25px Poppins; + color: #e1e1e1; + top: 10px; + left: 50%; + transform: translate(-50%, 0); + transition: color 0.2s; } .desc { - position: absolute; - font: normal normal normal 11px/17px Poppins; - color: #E1E1E1; - transition: all .2s; - top: 30px; - left: 70px; - transition: color .2s; + position: absolute; + font: normal normal normal 11px/17px Poppins; + color: #e1e1e1; + transition: all 0.2s; + top: 30px; + left: 70px; + transition: color 0.2s; } .green { - color: #1AC707; + color: #1ac707; } .red { - color: #FF0409; + color: #ff0409; } .etat-text { - position: absolute; - top: 20px; - right: 14px; - width: 49px; - height: 33px; - background-color: #292929; - border-radius: 4px; - transition: background-color .2s; + position: absolute; + top: 20px; + right: 14px; + width: 49px; + height: 33px; + background-color: #292929; + border-radius: 4px; + transition: background-color 0.2s; } .text { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - font: normal normal bold 13px/15px Poppins; - letter-spacing: 0px; - color: #E1E1E1; - transition: color .2s; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + font: normal normal bold 13px/15px Poppins; + letter-spacing: 0px; + color: #e1e1e1; + transition: color 0.2s; } .online { - position: absolute; - top: -6px; - left: 41px; - width: 10px; - height: 10px; - border-radius: 5px; - border: 2px solid #1A1A1A; - transition: all .2s; - background-color: #1AC707; + position: absolute; + top: -6px; + left: 41px; + width: 10px; + height: 10px; + border-radius: 5px; + border: 2px solid #1a1a1a; + transition: all 0.2s; + background-color: #1ac707; } .online.off { - background-color: #FF0409; + background-color: #ff0409; } -body, html { - height: 100%; - margin: 0; - font-family: 'Poppins'; - font-weight: 700; - overflow: hidden; - background-repeat: no-repeat; - background-size: 100%; +body, +html { + height: 100%; + margin: 0; + font-family: "Poppins"; + font-weight: 700; + overflow: hidden; + background-repeat: no-repeat; + background-size: 100%; } * { - font-family: 'Poppins'; - font-weight: 700; + font-family: "Poppins"; + font-weight: 700; } .bottom_bar { - opacity: 1; - display: flex; - justify-content: space-between; - align-items: center; - height: 75px; - padding: 0 20px; - background-color: #1f1f1f; - position: fixed; - bottom: 0; - left: 0; - width: 100%; - z-index: 9999; + opacity: 1; + display: flex; + justify-content: space-between; + align-items: center; + height: 75px; + padding: 0 20px; + background-color: #1f1f1f; + position: fixed; + bottom: 0; + left: 0; + width: 100%; + z-index: 9999; } .button { - height: 45px; - margin-left: 5px; - border-radius: 5px; + height: 45px; + margin-left: 5px; + border-radius: 5px; } #settings-btn { - margin-left: 0px; - margin-right: 0px; - width: 45px; + margin-left: 0px; + margin-right: 0px; + width: 45px; } #btnShowNews { - width: 45px; + width: 45px; } #play-btn { - margin-right: 0px; + margin-right: 0px; } -*, div { - font-family: 'Poppins'; - font-weight: 700; +*, +div { + font-family: "Poppins"; + font-weight: 700; } - .errores::-webkit-scrollbar { - width: var(--scroll-size, 15px); - } +.errores::-webkit-scrollbar { + width: var(--scroll-size, 15px); +} - .errores::-webkit-scrollbar-thumb { - background: var(--scroll-thumb, linear-gradient(45deg, #00aeff, #a68eff)); - border-radius: var(--scroll-radius, 3px); - } +.errores::-webkit-scrollbar-thumb { + background: var(--scroll-thumb, linear-gradient(45deg, #00aeff, #a68eff)); + border-radius: var(--scroll-radius, 3px); +} - .errores::-webkit-scrollbar-track { - background: var(--scroll-track, rgb(255 255 255 / 10%)); - } +.errores::-webkit-scrollbar-track { + background: var(--scroll-track, rgb(255 255 255 / 10%)); +} - .modal-card-body::-webkit-scrollbar { - width: var(--scroll-size, 15px); - } +.modal-card-body::-webkit-scrollbar { + width: var(--scroll-size, 15px); +} - .modal-card-body::-webkit-scrollbar-thumb { - background: var(--scroll-thumb, linear-gradient(45deg, #00aeff, #a68eff)); - } +.modal-card-body::-webkit-scrollbar-thumb { + background: var(--scroll-thumb, linear-gradient(45deg, #00aeff, #a68eff)); +} - .modal-card-body::-webkit-scrollbar-track { - background: var(--scroll-track, rgb(255 255 255 / 10%)); - } +.modal-card-body::-webkit-scrollbar-track { + background: var(--scroll-track, rgb(255 255 255 / 10%)); +} - .ad { - position: relative; - width: 100%; - height: 180px; - border-radius: 5px; - opacity: 1; - margin-bottom: -20px; - background-size: cover; - background-repeat: no-repeat; - cursor: pointer; - } +.ad { + position: relative; + width: 100%; + height: 180px; + border-radius: 5px; + opacity: 1; + margin-bottom: -20px; + background-size: cover; + background-repeat: no-repeat; + cursor: pointer; +} .radio-button-container { - display: flex; - align-items: center; - gap: 10px; - flex-wrap: wrap; - /* Agregamos esta propiedad para que los elementos se salten de línea */ - margin-left: -5px; - margin-top: 5px; -} - - .radio-button { - display: inline-block; - position: relative; - cursor: pointer; - } + display: flex; + align-items: center; + gap: 10px; + flex-wrap: wrap; + /* Agregamos esta propiedad para que los elementos se salten de línea */ + margin-left: -5px; + margin-top: 5px; +} - .radio-button__input { - position: absolute; - opacity: 0; - width: 0; - height: 0; - } +.radio-button { + display: inline-block; + position: relative; + cursor: pointer; +} - .radio-button__label { - display: inline-block; - padding-left: 25px; - position: relative; - font-size: 16px; - color: #f2f2f2; - font-weight: 600; - cursor: pointer; - transition: all 0.3s ease; - } +.radio-button__input { + position: absolute; + opacity: 0; + width: 0; + height: 0; +} - .radio-button__custom { - position: absolute; - top: 0; - left: 4; - width: 18px; - height: 18px; - border-radius: 40%; - border: 2px solid #555; - transition: all 0.3s ease; - } +.radio-button__label { + display: inline-block; + padding-left: 25px; + position: relative; + font-size: 16px; + color: #f2f2f2; + font-weight: 600; + cursor: pointer; + transition: all 0.3s ease; +} - .radio-button__input:checked+.radio-button__label .radio-button__custom { - background-color: #4c8bf5; - border-color: transparent; - transform: scale(0.8); - box-shadow: 0 0 20px #4c8bf580; - } +.radio-button__custom { + position: absolute; + top: 0; + left: 4; + width: 18px; + height: 18px; + border-radius: 40%; + border: 2px solid #555; + transition: all 0.3s ease; +} - .radio-button__input:checked+.radio-button__label { - color: #4c8bf5; - } +.radio-button__input:checked + .radio-button__label .radio-button__custom { + background-color: #4c8bf5; + border-color: transparent; + transform: scale(0.8); + box-shadow: 0 0 20px #4c8bf580; +} - .radio-button__label:hover .radio-button__custom { - transform: scale(1.1); - border-color: #4c8bf5; - box-shadow: 0 0 20px #4c8bf580; - } +.radio-button__input:checked + .radio-button__label { + color: #4c8bf5; +} - .radio-button__input-with-margin { - margin-left: -5px; - margin-top: 5px; - } +.radio-button__label:hover .radio-button__custom { + transform: scale(1.1); + border-color: #4c8bf5; + box-shadow: 0 0 20px #4c8bf580; +} - .progress-bar.battly-s3gsqm { - max-width: 100%; - width: 100%; - height: 15px; - border-radius: 5px; - overflow: hidden; - background-color: #fff; - } +.radio-button__input-with-margin { + margin-left: -5px; + margin-top: 5px; +} + +.progress-bar.battly-s3gsqm { + max-width: 100%; + width: 100%; + height: 15px; + border-radius: 5px; + overflow: hidden; + background-color: #fff; +} + +.progress-fill.battly-s3gsqm { + height: 100%; + border-radius: 5px; + overflow: hidden; + transition: 600ms ease width, 150ms ease background-color; + transform-origin: left; + background-color: var(--accent); +} + +.progress-bar.error .progress-fill { + background-color: var(--danger); +} + +.progress-bar.success .progress-fill { + background-color: #3ac172; +} + +.progress-bar.warning .progress-fill { + background-color: #f7b924; +} + +.progress-bar.info .progress-fill { + background-color: #4c8bf5; +} - .progress-fill.battly-s3gsqm { - height: 100%; - border-radius: 5px; - overflow: hidden; - transition: 600ms ease width, 150ms ease background-color; - transform-origin: left; - background-color: var(--accent) +@keyframes moveRightLeft { + 0% { + width: 20%; + display: block; + transform: translateX(-40%); } - .progress-bar.error .progress-fill { - background-color: var(--danger) + 50% { + display: none; + width: 90%; + transform: translateX(100%); } - .progress-bar.success .progress-fill { - background-color: #3ac172 + 100% { + width: 20%; + transform: translateX(-40%); } +} - .progress-bar.warning .progress-fill { - background-color: #f7b924 - } - - .progress-bar.info .progress-fill { - background-color: #4c8bf5 - } - - @keyframes moveRightLeft { - 0% { - width: 20%; - display: block; - transform: translateX(-40%); - } - - 50% { - display: none; - width: 90%; - transform: translateX(100%); - } - - 100% { - width: 20%; - transform: translateX(-40%); - } - } - - .animated-fill { - animation: moveRightLeft 2s infinite; - } - - - - .modal-card, - .modal-card-head, - .modal-card-body, - .modal-card-foot { - background-color: #212121; - } - - .context-menu { - display: none; - position: absolute; - background-color: #212121; - border: 1px solid #ccc; - color: #fff; - padding: 5px 0; - border-radius: 5px; - } - - .context-menu ul { - list-style-type: none; - margin: 0; - padding: 0; - } - - .context-menu ul li { - padding: 5px 20px; - } - - .context-menu li:hover { - background-color: #373737; - color: #fff; - } \ No newline at end of file +.animated-fill { + animation: moveRightLeft 2s infinite; +} + +.modal-card, +.modal-card-head, +.modal-card-body, +.modal-card-foot { + background-color: #212121; +} + +.context-menu { + display: none; + position: absolute; + background-color: #212121; + border: 1px solid #ccc; + color: #fff; + padding: 5px 0; + border-radius: 5px; +} + +.context-menu ul { + list-style-type: none; + margin: 0; + padding: 0; +} + +.context-menu ul li { + padding: 5px 20px; +} + +.context-menu li:hover { + background-color: #373737; + color: #fff; +} + +button:hover .button-span { + opacity: 1; + visibility: visible; + transform: translate(-50%, 0); +} + +button .button-span { + position: absolute; + left: 50%; + bottom: 100%; + opacity: 0; + visibility: hidden; + margin-bottom: 1em; + padding: 1em; + background-color: #000; + border-radius: 10px; + font-size: 0.6em; + line-height: 1.6; + text-align: left; + white-space: nowrap; + transform: translate(-50%, 1em); + transition: all 0.15s ease-in-out; +} + +button .button-span::before { + content: ""; + position: absolute; + top: 100%; + left: 50%; + width: 0; + height: 0; + border: 0.5em solid transparent; + border-top-color: #000; + transform: translate(-50%, 0); +} + +/* play button */ +button:hover .play-button-span { + opacity: 1; + visibility: visible; + transform: translate(-50%, 0); +} + +button .play-button-span { + position: absolute; + left: 20%; + bottom: 100%; + opacity: 0; + visibility: hidden; + margin-bottom: 1em; + padding: 1em; + background-color: #000; + border-radius: 10px; + font-size: 0.6em; + line-height: 1.6; + text-align: left; + white-space: nowrap; + transform: translate(-50%, 1em); + transition: all 0.15s ease-in-out; +} + +button .play-button-span::before { + content: ""; + position: absolute; + top: 100%; + left: 65%; + width: 0; + height: 0; + border: 0.5em solid transparent; + border-top-color: #000; + transform: translate(-50%, 0); +} + +/* settings button */ +button:hover .settings-button-span { + opacity: 1; + visibility: visible; + transform: translate(-10%, 0); +} + +button .settings-button-span { + position: absolute; + left: 20%; + bottom: 100%; + opacity: 0; + visibility: hidden; + margin-bottom: 1em; + padding: 1em; + background-color: #000; + border-radius: 10px; + font-size: 0.6em; + line-height: 1.6; + text-align: left; + white-space: nowrap; + transform: translate(-10%, 1em); + transition: all 0.15s ease-in-out; +} + +button .settings-button-span::before { + content: ""; + position: absolute; + top: 100%; + left: 15%; + width: 0; + height: 0; + border: 0.5em solid transparent; + border-top-color: #000; + transform: translate(-40%, 0); +} diff --git a/src/assets/css/panels/settings.css b/src/assets/css/panels/settings.css index ec0f9a9..a3f6eac 100644 --- a/src/assets/css/panels/settings.css +++ b/src/assets/css/panels/settings.css @@ -1,138 +1,132 @@ .tabs-settings-btn { - position: fixed; - bottom: 0; - width: 100%; - height: 85px; - border-top-left-radius: 10px; - border-top-right-radius: 10px; - background: #00000080; - display: flex; - justify-content: center; + position: fixed; + bottom: 0; + width: 100%; + height: 85px; + border-top-left-radius: 10px; + border-top-right-radius: 10px; + background: #00000080; + display: flex; + justify-content: center; } -.swal-overlay { font-family: "Poppins"} +.swal-overlay { + font-family: "Poppins"; +} -.media-content, section { - overflow: hidden; +.media-content, +section { + overflow: hidden; } .modal-card-body { - overflow: hidden; + overflow: hidden; } .tab-btn-css { - border-radius: 5px; - width: auto; - height: 37px; - margin: 10px; - font-family: Poppins; - font-weight: 700; - font-size: 17px; - cursor: pointer; - outline: none; - color: #fff; + border-radius: 5px; + width: auto; + height: 37px; + margin: 10px; + font-family: Poppins; + font-weight: 700; + font-size: 17px; + cursor: pointer; + outline: none; + color: #fff; } .tab-btn-css:hover { - background: #3e8ed0; + background: #3e8ed0; } - .bottom_bar_settings { - display: flex; - justify-content: space-between; - align-items: center; - height: 75px; - padding: 0 20px; - background-color: #1f1f1f; - position: fixed; - bottom: 0; - left: 0; - width: 100%; - z-index: 999; - overflow: -moz-scrollbars-none; - -ms-overflow-style: none; - overflow-y: scroll; - overflow-x: hidden; - display: flex; - justify-content: center; - align-items: center; -} - + display: flex; + height: 75px; + padding: 0 20px; + background-color: #1f1f1f; + position: fixed; + bottom: 0; + left: 0; + width: 100%; + z-index: 9999; + justify-content: center; + align-items: center; +} + .bottom_bar_settings::-webkit-scrollbar { - width: 0; + width: 0; } .active-tab-btn { - background: #3ea8ff; - border: none; - box-shadow: 0 0 5px #1e4e76; + background: #3ea8ff; + border: none; + box-shadow: 0 0 5px #1e4e76; } .active-tab-btn:hover { - background: #3e8ed0; - border: none; + background: #3e8ed0; + border: none; } .tabs-settings-content { - position: absolute; - top: 47%; - left: 50%; - transform: translate(-50%, -50%); - width: 95%; - height: 80%; - padding-bottom: 1.5rem; - border-radius: 5px; - background: transparent; - opacity: 0; - pointer-events: none; + position: absolute; + top: 47%; + left: 50%; + transform: translate(-50%, -50%); + width: 95%; + height: 80%; + padding-bottom: 1.5rem; + border-radius: 5px; + background: transparent; + opacity: 0; + pointer-events: none; } .not-pointer-events { - pointer-events: none; + pointer-events: none; } .active-tab-content { - opacity: 1; - pointer-events: all; + opacity: 1; + pointer-events: all; } .information { - padding: 0 40px; - font: normal normal normal 16px/25px Poppins; - color: #F1F1F1; + padding: 0 40px; + font: normal normal normal 16px/25px Poppins; + color: #f1f1f1; } .title-settings { - text-align: center; - font: normal normal bold 20px/25px Poppins; - color: #F1F1F1; - margin: 2% 0; + text-align: center; + font: normal normal bold 20px/25px Poppins; + color: #f1f1f1; + margin: 2% 0; } .center-align { - text-align: center; + text-align: center; } .settings-content-scroll { - overflow: auto; - width: 100%; - height: 100%; + overflow: auto; + width: 100%; + height: 100%; } .settings-content-scroll::-webkit-scrollbar { - width: 0; + width: 0; } .center-page { - top: 47%; - left: 50%; - transform: translate(-50%, -50%); - position: absolute; - width: 100%; + top: 47%; + left: 50%; + transform: translate(-50%, -50%); + position: absolute; + width: 100%; } - /******************************************************************************* * * * account sttings * @@ -140,113 +134,111 @@ ******************************************************************************/ .add-account { - width: 70%; - height: 10%; - border: none; - border-radius: 5px; - font: normal normal bold 30px/40px Poppins; - color: #D1D1D1; - background-color: #303030; - box-shadow: 1px 2px 5px #585858; - margin: 20px 0; - margin-bottom: 10px; + width: 70%; + height: 10%; + border: none; + border-radius: 5px; + font: normal normal bold 30px/40px Poppins; + color: #d1d1d1; + background-color: #303030; + box-shadow: 1px 2px 5px #585858; + margin: 20px 0; + margin-bottom: 10px; } .add-account:hover { - background-color: #005daa; - box-shadow: 1px 2px 5px #275276; + background-color: #005daa; + box-shadow: 1px 2px 5px #275276; } .accounts { - display: contents; - justify-content: center; + display: contents; + justify-content: center; } .account { - display: inline-block; - background: #3e8ed0; - border: 4px solid #005daa; - font: normal normal bold 30px/40px Poppins; - width: 500px; - height: 100px; - margin: 1% 2%; - border-radius:5px; - text-align: start; - color: #fff; + display: inline-block; + background: #3e8ed0; + border: 4px solid #005daa; + font: normal normal bold 30px/40px Poppins; + width: 500px; + height: 100px; + margin: 1% 2%; + border-radius: 5px; + text-align: start; + color: #fff; + cursor: pointer; } .account:hover { - background: #005daa; - border: 4px solid #275276; + background: #005daa; + border: 4px solid #275276; } - .active-account { - background: #3e8ed0; - border: 4px solid #00ff91; - color: #fff; + background: #3e8ed0; + border: 4px solid #00ff91; + color: #fff; } .active-account:hover { - background: #005daa; - border: 4px solid #275276; + background: #005daa; + border: 4px solid #275276; } - .account-image { - position: absolute; - height: 70px; - margin: 15px 20px; - pointer-events: none; + position: absolute; + height: 70px; + margin: 15px 20px; + pointer-events: none; } .account-name { - margin: 0 100px; - margin-top: 25px; - font: normal normal bold 40px/45px Poppins; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - max-width: 29ch; + margin: 0 100px; + margin-top: 25px; + font: normal normal bold 40px/45px Poppins; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + max-width: 29ch; } .add-account-name { - margin: 0 100px; - margin-top: 25px; - font: normal normal bold 40px/45px Poppins; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - max-width: 29ch; + margin: 0 100px; + margin-top: 25px; + font: normal normal bold 40px/45px Poppins; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + max-width: 29ch; } .account-uuid { - margin: 0 100px; - font: normal normal normal 18px/27px Poppins; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - max-width: 29ch; - pointer-events: none; + margin: 0 100px; + font: normal normal normal 18px/27px Poppins; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + max-width: 29ch; + pointer-events: none; } .account-delete { - margin: -50px 415px; - font-size: 50px; - width: 65px; - height: 65px; - border-radius: 5px; - cursor: pointer; - text-align: center; + margin: -50px 415px; + font-size: 50px; + width: 65px; + height: 65px; + border-radius: 5px; + cursor: pointer; + text-align: center; } .icon-account-delete-btn { - margin: 7px 9px; - position: absolute; - pointer-events: none; + margin: 7px 9px; + position: absolute; + pointer-events: none; } - /******************************************************************************* * * * java settings * @@ -254,154 +246,153 @@ ******************************************************************************/ .java-settings { - background: #292929; - border-radius: 5px; - width: 90%; - margin: 0 auto; - padding: 20px; + background: #292929; + border-radius: 5px; + width: 90%; + margin: 0 auto; + padding: 20px; } .memory-slider { - position: relative; - margin: 24px; - height: 18px; - width: 550px; - user-select: none; + position: relative; + margin: 24px; + height: 18px; + width: 550px; + user-select: none; } .slider-touch-left, .slider-touch-right { - box-sizing: border-box; - display: block; - position: absolute; - height: 18px; - width: 18px; - z-index: 2; - top: 4; + box-sizing: border-box; + display: block; + position: absolute; + height: 18px; + width: 18px; + z-index: 2; + top: 4; } .slider-touch-left span, .slider-touch-right span { - display: block; - width: 20px; - height: 10px; - background: #F1F1F1; - border: 4px solid #3e8ed0; - transition: background-color .2s, border .2s; - border-radius: 18px; - cursor: pointer; + display: block; + width: 20px; + height: 10px; + background: #f1f1f1; + border: 4px solid #3e8ed0; + transition: background-color 0.2s, border 0.2s; + border-radius: 18px; + cursor: pointer; } .slider-touch-left span:after, .slider-touch-right span:after { - content: attr(value); - color: #3e8ed0; - font: normal normal bold 12px/18px Poppins; - white-space: nowrap; - pointer-events: none; - position: absolute; - top: -20px; - left: 83%; - transform: translate(-50%); + content: attr(value); + color: #3e8ed0; + font: normal normal bold 12px/18px Poppins; + white-space: nowrap; + pointer-events: none; + position: absolute; + top: -20px; + left: 83%; + transform: translate(-50%); } .slider-line { - box-sizing: border-box; - position: absolute; - width: calc(100% - 18px); - left: 9px; - top: 7px; - height: 4px; - border-radius: 4px; - background-color: #F0F0F0; - transition: background-color .2s; - z-index: 0; - overflow: hidden; + box-sizing: border-box; + position: absolute; + width: calc(100% - 18px); + left: 9px; + top: 7px; + height: 4px; + border-radius: 4px; + background-color: #f0f0f0; + transition: background-color 0.2s; + z-index: 0; + overflow: hidden; } .slider-line span { - display: block; - height: 100%; - width: 0%; - background: #3e8ed0; - transition: background-color .2s; + display: block; + height: 100%; + width: 0%; + background: #3e8ed0; + transition: background-color 0.2s; } .ram-info { - display: flex; - align-items: center; - font: normal normal bold 15px/25px Poppins; - color: #F1F1F1F1; + display: flex; + align-items: center; + font: normal normal bold 15px/25px Poppins; + color: #f1f1f1f1; } .path { - min-width: 50%; - font: normal normal normal 13px/20px Poppins; - border-radius: 18px; - padding: 8px 16px; - margin: 0 40px; - margin-top: 2%; - color: #F1F1F1F1; - background-color: #1f1f1f; - user-select: text; - transition: color .2s, background-color .2s; - border: none; - outline: none; + min-width: 50%; + font: normal normal normal 13px/20px Poppins; + border-radius: 18px; + padding: 8px 16px; + margin: 0 40px; + margin-top: 2%; + color: #f1f1f1f1; + background-color: #1f1f1f; + user-select: text; + transition: color 0.2s, background-color 0.2s; + border: none; + outline: none; } .path-button { - font: normal normal bold 13px/20px Poppins; - border-radius: 18px; - padding: 8px 30px; - background-color: #00bd7a; - cursor: pointer; - margin-left: 20px; - transition: color .2s, background-color .2s; - border: none; - outline: none; + font: normal normal bold 13px/20px Poppins; + border-radius: 18px; + padding: 8px 30px; + background-color: #00bd7a; + cursor: pointer; + margin-left: 20px; + transition: color 0.2s, background-color 0.2s; + border: none; + outline: none; } .path-button:hover { - background-color: #1f1f1f; + background-color: #1f1f1f; } .path-button-reset { - font: normal normal bold 13px/20px Poppins; - border-radius: 18px; - padding: 8px 30px; - background-color: #00bd7a; - cursor: pointer; - margin-left: 20px; - transition: color .2s, background-color .2s; - border: none; - outline: none; + font: normal normal bold 13px/20px Poppins; + border-radius: 18px; + padding: 8px 30px; + background-color: #00bd7a; + cursor: pointer; + margin-left: 20px; + transition: color 0.2s, background-color 0.2s; + border: none; + outline: none; } .path-button-reset:hover { - background-color: #1f1f1f; + background-color: #1f1f1f; } .path-file { - display: none; - pointer-events: none; + display: none; + pointer-events: none; } .args-settings { - min-width: 50%; - font: normal normal normal 13px/20px Poppins; - border-radius: 18px; - padding: 8px 16px; - margin: 0 40px; - margin-top: 2%; - color: #F1F1F1F1; - background-color: #1f1f1f; - user-select: text; - transition: color .2s, background-color .2s; - border: none; - outline: none; + min-width: 50%; + font: normal normal normal 13px/20px Poppins; + border-radius: 18px; + padding: 8px 16px; + margin: 0 40px; + margin-top: 2%; + color: #f1f1f1f1; + background-color: #1f1f1f; + user-select: text; + transition: color 0.2s, background-color 0.2s; + border: none; + outline: none; } - /******************************************************************************* * * * resolution settings * @@ -409,115 +400,114 @@ ******************************************************************************/ .input-size-content { - height: 5rem; + height: 5rem; } .input-size { - position: absolute; - display: flex; - left: 50%; - top: 70%; - transform: translate(-50%, 0); + position: absolute; + display: flex; + left: 50%; + top: 70%; + transform: translate(-50%, 0); } .input-settings { - text-align: center; - background: #1f1f1f; - border: none; - outline: none; - border-radius: 40px; - font-size: 20px; - width: 100px; - color: #F1F1F1F1; + text-align: center; + background: #1f1f1f; + border: none; + outline: none; + border-radius: 40px; + font-size: 20px; + width: 100px; + color: #f1f1f1f1; } .size-cross { - margin: 10px; + margin: 10px; } .size-cross:before { - font: normal normal bold 20px Icons; - content: "\e90e"; + font: normal normal bold 20px Icons; + content: "\e90e"; } .select-wrap { - display: inline-flex; - margin-left: 10px; + display: inline-flex; + margin-left: 10px; } .select-wrap:before { - position: absolute; - top: 53%; - transform: translate(20px, -50%); - font-size: 24px; - pointer-events: none; + position: absolute; + top: 53%; + transform: translate(20px, -50%); + font-size: 24px; + pointer-events: none; } .select-wrap:after { - position: relative; - top: -6px; - content: "\e903"; - font-family: 'Icons'; - margin-left: -1.2em; - font-size: 24px; - pointer-events: none; - transform: rotate(180deg); - color: black; - transition: color .2s; - pointer-events: none; + position: relative; + top: -6px; + content: "\e903"; + font-family: "Icons"; + margin-left: -1.2em; + font-size: 24px; + pointer-events: none; + transform: rotate(180deg); + color: black; + transition: color 0.2s; + pointer-events: none; } .select { - border-radius: 40px; - background-color: #00bd7a; - font: normal normal normal 12px/18px Poppins; - transition: color .2s, box-shadow .2s; - border: none; - outline: none; - appearance: none; + border-radius: 40px; + background-color: #00bd7a; + font: normal normal normal 12px/18px Poppins; + transition: color 0.2s, box-shadow 0.2s; + border: none; + outline: none; + appearance: none; } - /******************************************************************************* * * * launcher settings * * * ******************************************************************************/ - .checkbox-settings { - display: none; +.checkbox-settings { + display: none; } -.checkbox-settings+label { - display: inline; - position: relative; - top: 2px; - margin-right: 24px; - width: 16px; - height: 16px; - border-radius: 8px; - transition: background-color .2s; - padding: 0px; - background-color: #FFFFFF; - cursor: pointer; +.checkbox-settings + label { + display: inline; + position: relative; + top: 2px; + margin-right: 24px; + width: 16px; + height: 16px; + border-radius: 8px; + transition: background-color 0.2s; + padding: 0px; + background-color: #ffffff; + cursor: pointer; } .checkround { - position: absolute; - z-index: 2; - border-radius: 7px; - transition: all .2s; - background-color: #FFFFFF; + position: absolute; + z-index: 2; + border-radius: 7px; + transition: all 0.2s; + background-color: #ffffff; } -.checkbox-settings:checked+label { - background-color: #285880; +.checkbox-settings:checked + label { + background-color: #285880; } .checkround { - border-radius: 3px; + border-radius: 3px; } -.checkbox-settings+label { - display: inline-block; - margin-right: 8px; -} \ No newline at end of file +.checkbox-settings + label { + display: inline-block; + margin-right: 8px; +} diff --git a/src/assets/js/index.js b/src/assets/js/index.js index 2c114ca..6d39598 100644 --- a/src/assets/js/index.js +++ b/src/assets/js/index.js @@ -18,18 +18,8 @@ const axios = require("axios"); import { Lang } from './utils/lang.js'; let lang; -// Llama a GetLang en la instancia - - -/** - * Represents the Splash class. - * @class - */ class Splash { - /** - * Creates an instance of Splash. - * @constructor - */ + constructor() { this.LoadLang(); this.splash = document.querySelector(".splash"); @@ -37,7 +27,7 @@ class Splash { this.splashAuthor = document.querySelector(".splash-author"); this.message = document.querySelector(".message"); this.progress = document.querySelector("progress"); - document.addEventListener('DOMContentLoaded', () => this.startAnimation()); + document.addEventListener('DOMContentLoaded', () => this.start()); } async LoadLang() { @@ -45,12 +35,7 @@ class Splash { this.message.innerHTML = lang.salutate; } - - /** - * Starts the splash animation. - * @async - */ - async startAnimation() { + async start() { let splashes = [{ "message": "Battly Launcher", "author": "TECNO BROS" @@ -74,10 +59,11 @@ class Splash { this.splashMessage.classList.add("animate__animated", "animate__flipInX"); this.splashAuthor.classList.add("animate__animated", "animate__flipInX"); this.message.classList.add("animate__animated", "animate__flipInX"); + await sleep(1000); fetch("https://google.com").then(async () => { - this.maintenanceCheck(); + this.checkMaintenance(); localStorage.setItem("offline-mode", false); }).catch(async () => { localStorage.setItem("offline-mode", true); @@ -87,44 +73,40 @@ class Splash { await sleep(1500); this.setStatus(lang.starting_battly); await sleep(500); - this.startLauncher(); + this.startBattly(); }) } - /** - * Checks for updates. - * @async - */ - async checkUpdate() { - if(dev) return sleep(500).then(async () => { + async checkForUpdates() { + if (dev) return sleep(500).then(async () => { - //aplicar las animaciones pero al reves - this.splash.classList.remove("translate"); - this.splashMessage.classList.add("animate__animated", "animate__flipOutX"); - this.splashAuthor.classList.add("animate__animated", "animate__flipOutX"); - await sleep(500); - this.startLauncher(); + this.splash.classList.remove("translate"); + this.splashMessage.classList.add("animate__animated", "animate__flipOutX"); + this.splashAuthor.classList.add("animate__animated", "animate__flipOutX"); + await sleep(500); + this.startBattly(); }); + this.setStatus(lang.checking_updates); ipcRenderer.invoke('update-app').then(err => { - if(err) { - if (err.error) { - let error = err.message; + if (err) { + if (err.error) { + let error = err.message; error = error.toString().slice(0, 50); - this.shutdown(`${lang.update_error}
${error}`); - } + this.shutdown(`${lang.update_error}
${error}`); + } } - }) + }) - ipcRenderer.on('updateAvailable', () => { - this.setStatus(lang.update_available); - this.toggleProgress(); + ipcRenderer.on('updateAvailable', () => { + this.setStatus(lang.update_available); let boton_actualizar = document.getElementById("btn_actualizar"); boton_actualizar.style.display = "block"; boton_actualizar.addEventListener("click", () => { - this.setStatus(lang.downloading_update); + this.setStatus(lang.downloading_update); + this.toggleProgress(); ipcRenderer.send('start-update'); }) @@ -132,17 +114,17 @@ class Splash { boton_cancelar.style.display = "block"; boton_cancelar.addEventListener("click", () => { this.setStatus(lang.update_cancelled); - this.maintenanceCheck(); + this.checkMaintenance(); }) - }) + }) - ipcRenderer.on('download-progress', (event, progress) => { - this.setProgress(progress.transferred, progress.total); - }) + ipcRenderer.on('download-progress', (event, progress) => { + this.setProgress(progress.transferred, progress.total); + }) - ipcRenderer.on('update-not-available', () => { - this.startLauncher(); - }) + ipcRenderer.on('update-not-available', () => { + this.startBattly(); + }) ipcRenderer.on('update-downloaded', async () => { this.setStatus(lang.update_downloaded); @@ -154,17 +136,13 @@ class Splash { ) } - /** - * Checks for maintenance mode. - * @async - */ - async maintenanceCheck() { + async checkMaintenance() { config.GetConfig().then(async res => { if (res.maintenance) return this.shutdown(res.maintenance_message); this.setStatus(lang.starting_launcher); - await sleep(500); + await sleep(500); setTimeout(() => { - this.checkUpdate(); + this.checkForUpdates(); }, 1000); return true; }).catch(e => { @@ -173,11 +151,7 @@ class Splash { }) } - /** - * Starts the launcher. - * @async - */ - async startLauncher() { + async startBattly() { this.splash.classList.remove("translate"); this.splashMessage.classList.add("animate__animated", "animate__flipOutX"); this.splashAuthor.classList.add("animate__animated", "animate__flipOutX"); @@ -187,10 +161,6 @@ class Splash { ipcRenderer.send('update-window-close'); } - /** - * Shuts down the launcher. - * @param {string} text - The shutdown message. - */ shutdown(text) { this.setStatus(`${text}
${lang.closing_countdown} 10s`); let i = 10; @@ -201,32 +171,18 @@ class Splash { }, 1000); } - /** - * Sets the status message. - * @param {string} text - The status message. - */ setStatus(text) { this.message.innerHTML = text; } - /** - * Toggles the progress bar. - */ toggleProgress() { if (this.progress.classList.toggle("show")) this.setProgress(0, 1); } - /** - * Sets the progress bar value. - * @param {number} value - The progress value. - * @param {number} max - The maximum progress value. - */ setProgress(value, max) { this.progress.value = value; this.progress.max = max; } - - } function sleep(ms) { @@ -236,6 +192,11 @@ function sleep(ms) { document.addEventListener("keydown", (e) => { if (e.ctrlKey && e.shiftKey && e.keyCode == 73 || e.keyCode == 123) { ipcRenderer.send("update-window-dev-tools"); + + console.log("%c¡ESPERA!", "color: #3e8ed0; font-size: 70px; font-weight: bold; font-family: 'Poppins'; text-shadow: 0 0 5px #000;"); + console.log("%c¡No hagas nada aquí si no sabes lo que estás haciendo!", "color: #3e8ed0; font-size: 18px; font-weight: bold; font-family: 'Poppins';"); + console.log("%cTampoco pegues nada externo aquí, ¡hay un 101% de posibilidades de que sea un virus!", "color: #3e8ed0; font-size: 15px; font-weight: bold; font-family: 'Poppins';"); } }) + new Splash(); diff --git a/src/assets/js/launcher.js b/src/assets/js/launcher.js index fea6f41..f4e5237 100644 --- a/src/assets/js/launcher.js +++ b/src/assets/js/launcher.js @@ -40,6 +40,25 @@ class Launcher { document.addEventListener("keydown", (e) => { if (e.ctrlKey && e.shiftKey && e.keyCode == 73 || e.keyCode == 123) { ipcRenderer.send("main-window-dev-tools"); + + console.adv([ + "%c¡ESPERA!", "color: #3e8ed0; font-size: 70px; font-weight: bold; font-family: 'Poppins'; text-shadow: 0 0 5px #000;"]); + console.adv(["%c¡No hagas nada aquí si no sabes lo que estás haciendo!", "color: #3e8ed0; font-size: 18px; font-weight: bold; font-family: 'Poppins';"]); + console.adv(["%cTampoco pegues nada externo aquí, ¡hay un 101% de posibilidades de que sea un virus!", "color: red; font-size: 15px; font-weight: bold; font-family: 'Poppins';"]); + + setTimeout(() => { + console.adv([ + "%c¡ESPERA!", "color: #3e8ed0; font-size: 70px; font-weight: bold; font-family: 'Poppins'; text-shadow: 0 0 5px #000;"]); + console.adv(["%c¡No hagas nada aquí si no sabes lo que estás haciendo!", "color: #3e8ed0; font-size: 18px; font-weight: bold; font-family: 'Poppins';"]); + console.adv(["%cTampoco pegues nada externo aquí, ¡hay un 101% de posibilidades de que sea un virus!", "color: red; font-size: 15px; font-weight: bold; font-family: 'Poppins';"]); + }, 1000); + + setTimeout(() => { + console.adv([ + "%c¡ESPERA!", "color: #3e8ed0; font-size: 70px; font-weight: bold; font-family: 'Poppins'; text-shadow: 0 0 5px #000;"]); + console.adv(["%c¡No hagas nada aquí si no sabes lo que estás haciendo!", "color: #3e8ed0; font-size: 18px; font-weight: bold; font-family: 'Poppins';"]); + console.adv(["%cTampoco pegues nada externo aquí, ¡hay un 101% de posibilidades de que sea un virus!", "color: red; font-size: 15px; font-weight: bold; font-family: 'Poppins';"]); + }, 1500); } }) new logger('Launcher', '#3e8ed0') diff --git a/src/assets/js/panels/friends.js b/src/assets/js/panels/friends.js index 8b06fe3..613d8f5 100644 --- a/src/assets/js/panels/friends.js +++ b/src/assets/js/panels/friends.js @@ -7,7 +7,6 @@ import { logger, database, changePanel } from '../utils.js'; -const { ipcRenderer } = require('electron'); const pkg = require('../package.json'); const fetch = require('node-fetch'); const axios = require("axios"); @@ -40,7 +39,6 @@ class Friends { lang = await new Lang().GetLang(); this.AddFriend(); this.Solicitudes(); - this.GetOnlineUsers(); this.ObtenerAmigos(); this.Chat(); } @@ -55,18 +53,6 @@ class Friends { }); } - async GetOnlineUsers() { - ipcRenderer.send("socket", "getOnlineUsers", {}); - - ipcRenderer.on("onlineUsers", (e, data) => { - console.log(data); - }); - - ipcRenderer.on('amigos', async (e, amigos_) => { - amigos = amigos_; - }); - } - async AddFriend() { let btnAddFriends = document.getElementById('add-friends'); @@ -290,15 +276,30 @@ class Friends { }); return; } else { - ipcRenderer.send('enviarSolicitud', { - sender: account.name, - sended: user, - password: account.password - }); - - new Alert().ShowAlert({ - icon: "success", - title: `${lang.request_sent_to} ${user} ${lang.correctly}.`, + fetch('https://api.battlylauncher.com/api/users/enviarSolicitud', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + username: account.name, + password: account.password, + amigo: user, + }) + }).then(res => res.json()).then(res => { + if (res.error) { + console.error(res.error); + + new Alert().ShowAlert({ + icon: "error", + title: lang.error_sending_request + }); + } else { + new Alert().ShowAlert({ + icon: "success", + title: `${lang.request_sent_to} ${user} ${lang.correctly}.`, + }); + } }); } }); @@ -382,15 +383,30 @@ class Friends { }); return; } else { - ipcRenderer.send('enviarSolicitud', { - sender: account.name, - sended: user, - password: account.password - }); - - new Alert().ShowAlert({ - icon: "success", - title: `${lang.request_sent_to} ${user} ${lang.correctly}.`, + fetch('https://api.battlylauncher.com/api/users/enviarSolicitud', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + username: account.name, + password: account.password, + amigo: user + }) + }).then(res => res.json()).then(res => { + if (res.error) { + console.error(res.error); + + new Alert().ShowAlert({ + icon: "error", + title: lang.error_sending_request + }); + } else { + new Alert().ShowAlert({ + icon: "success", + title: `${lang.request_sent_to} ${user} ${lang.correctly}.`, + }); + } }); } }); @@ -449,391 +465,477 @@ class Friends { modal.remove(); }); - // Crear el cuerpo del modal const modalBody = document.createElement('section'); modalBody.className = 'modal-card-body'; - ipcRenderer.send('obtener-solicitudes', { - username: account.name, - password: account.password - }); - ipcRenderer.on('solicitudes', async (e, solicitudes) => { + fetch('https://api.battlylauncher.com/api/users/obtenerSolicitudes', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + username: account.name, + password: account.password + }) + }).then(res => res.json()).then(async res => { + if (res.error) { + console.error(res.error); + new Alert().ShowAlert({ + icon: "error", + title: lang.error_loading_requests + }); + return; + } else { + let solicitudes = res; - if (solicitudes.enviadas.length == 0 && solicitudes.recibidas.length == 0) { - const box = document.createElement('div'); - box.className = 'box'; - box.style.padding = '0.75rem'; + if (solicitudes.enviadas.length == 0 && solicitudes.recibidas.length == 0) { + const box = document.createElement('div'); + box.className = 'box'; + box.style.padding = '0.75rem'; - const article = document.createElement('article'); - article.className = 'media'; + const article = document.createElement('article'); + article.className = 'media'; - const mediaLeft = document.createElement('div'); - mediaLeft.className = 'media-left'; + const mediaLeft = document.createElement('div'); + mediaLeft.className = 'media-left'; - const img = document.createElement('img'); - img.className = 'mc-face-viewer-5x'; - mediaLeft.appendChild(img); + const img = document.createElement('img'); + img.className = 'mc-face-viewer-5x'; + mediaLeft.appendChild(img); - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; - mediaContent.style.margin = '3 auto'; + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; + mediaContent.style.margin = '3 auto'; - const content = document.createElement('div'); - content.className = 'content'; + const content = document.createElement('div'); + content.className = 'content'; - const userParagraph = document.createElement('p'); - userParagraph.style.fontSize = '30px'; - userParagraph.textContent = lang.you_dont_have_any_friend_requests; - modalTitle.textContent = lang.you_dont_have_any_friend_requests; + const userParagraph = document.createElement('p'); + userParagraph.style.fontSize = '30px'; + userParagraph.textContent = lang.you_dont_have_any_friend_requests; + modalTitle.textContent = lang.you_dont_have_any_friend_requests; - content.appendChild(userParagraph); - mediaContent.appendChild(content); + content.appendChild(userParagraph); + mediaContent.appendChild(content); - article.appendChild(mediaLeft); - article.appendChild(mediaContent); + article.appendChild(mediaLeft); + article.appendChild(mediaContent); - box.appendChild(article); + box.appendChild(article); - modalBody.appendChild(box); + modalBody.appendChild(box); - img.style.backgroundImage = "url('https://minotar.net/skin/MHF_Steve.png')"; - } - - for (let solicitud of solicitudes.recibidas) { - try { - await axios.get(`https://api.battlylauncher.com/api/skin/${solicitud}.png`) - - const box1 = document.createElement('div'); - box1.className = 'box'; - box1.style.padding = '0.75rem'; + img.style.backgroundImage = "url('https://minotar.net/skin/MHF_Steve.png')"; + } - const article1 = document.createElement('article'); - article1.className = 'media'; + for (let solicitud of solicitudes.recibidas) { + try { + await axios.get(`https://api.battlylauncher.com/api/skin/${solicitud}.png`) - const mediaLeft1 = document.createElement('div'); - mediaLeft1.className = 'media-left'; + const box1 = document.createElement('div'); + box1.className = 'box'; + box1.style.padding = '0.75rem'; - const img1 = document.createElement('img'); - img1.className = 'mc-face-viewer-5x'; + const article1 = document.createElement('article'); + article1.className = 'media'; - mediaLeft1.appendChild(img1); + const mediaLeft1 = document.createElement('div'); + mediaLeft1.className = 'media-left'; - const mediaContent1 = document.createElement('div'); - mediaContent1.className = 'media-content'; - mediaContent1.style.margin = '3 auto'; + const img1 = document.createElement('img'); + img1.className = 'mc-face-viewer-5x'; - const content1 = document.createElement('div'); - content1.className = 'content'; + mediaLeft1.appendChild(img1); - const userParagraph1 = document.createElement('p'); - userParagraph1.style.fontSize = '30px'; - userParagraph1.textContent = solicitud; + const mediaContent1 = document.createElement('div'); + mediaContent1.className = 'media-content'; + mediaContent1.style.margin = '3 auto'; - content1.appendChild(userParagraph1); - mediaContent1.appendChild(content1); + const content1 = document.createElement('div'); + content1.className = 'content'; - const mediaRight1 = document.createElement('div'); - mediaRight1.className = 'media-right'; - mediaRight1.style.display = 'flex'; - mediaRight1.style.flexDirection = 'column'; - mediaRight1.style.alignItems = 'center'; + const userParagraph1 = document.createElement('p'); + userParagraph1.style.fontSize = '30px'; + userParagraph1.textContent = solicitud; - const acceptButton1 = document.createElement('button'); - acceptButton1.className = 'button is-success is-square'; - acceptButton1.style.height = '30px'; - acceptButton1.style.width = '10px'; - acceptButton1.style.margin = '5px auto'; + content1.appendChild(userParagraph1); + mediaContent1.appendChild(content1); - const acceptIcon1 = document.createElement('i'); - acceptIcon1.className = 'fa-solid fa-check'; + const mediaRight1 = document.createElement('div'); + mediaRight1.className = 'media-right'; + mediaRight1.style.display = 'flex'; + mediaRight1.style.flexDirection = 'column'; + mediaRight1.style.alignItems = 'center'; - acceptButton1.appendChild(acceptIcon1); - mediaRight1.appendChild(acceptButton1); + const acceptButton1 = document.createElement('button'); + acceptButton1.className = 'button is-success is-square'; + acceptButton1.style.height = '30px'; + acceptButton1.style.width = '10px'; + acceptButton1.style.margin = '5px auto'; - const rejectButton1 = document.createElement('button'); - rejectButton1.className = 'button is-danger is-square'; - rejectButton1.style.height = '30px'; - rejectButton1.style.width = '10px'; - rejectButton1.style.marginTop = '5px'; - rejectButton1.style.margin = '5px auto'; + const acceptIcon1 = document.createElement('i'); + acceptIcon1.className = 'fa-solid fa-check'; - const rejectIcon1 = document.createElement('i'); - rejectIcon1.className = 'fa-solid fa-xmark'; + acceptButton1.appendChild(acceptIcon1); + mediaRight1.appendChild(acceptButton1); - rejectButton1.appendChild(rejectIcon1); - mediaRight1.appendChild(rejectButton1); + const rejectButton1 = document.createElement('button'); + rejectButton1.className = 'button is-danger is-square'; + rejectButton1.style.height = '30px'; + rejectButton1.style.width = '10px'; + rejectButton1.style.marginTop = '5px'; + rejectButton1.style.margin = '5px auto'; - article1.appendChild(mediaLeft1); - article1.appendChild(mediaContent1); - article1.appendChild(mediaRight1); + const rejectIcon1 = document.createElement('i'); + rejectIcon1.className = 'fa-solid fa-xmark'; - box1.appendChild(article1); + rejectButton1.appendChild(rejectIcon1); + mediaRight1.appendChild(rejectButton1); - modalBody.appendChild(box1); - img1.style.backgroundImage = "url('https://api.battlylauncher.com/api/skin/" + solicitud + ".png')"; + article1.appendChild(mediaLeft1); + article1.appendChild(mediaContent1); + article1.appendChild(mediaRight1); + box1.appendChild(article1); - closeButton.addEventListener('click', () => { - modal.remove(); - }); + modalBody.appendChild(box1); + img1.style.backgroundImage = "url('https://api.battlylauncher.com/api/skin/" + solicitud + ".png')"; - acceptButton1.addEventListener('click', () => { - ipcRenderer.send('aceptar-solicitud', { - username: account.name, - solicitud: solicitud, - password: account.password - }); - new Alert().ShowAlert({ - icon: "success", - title: lang.request_accepted + closeButton.addEventListener('click', () => { + modal.remove(); }); - modal.remove(); - }); - - rejectButton1.addEventListener('click', () => { - ipcRenderer.send('rechazar-solicitud', { - username: account.name, - solicitud: solicitud, - password: account.password + acceptButton1.addEventListener('click', () => { + fetch('https://api.battlylauncher.com/api/users/aceptarSolicitud', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + username: account.name, + solicitud: solicitud, + password: account.password + }) + }).then(res => res.json()).then(res => { + if (res.error) { + console.error(res.error); + + new Alert().ShowAlert({ + icon: "error", + title: lang.error_accepting_request + }); + } else { + new Alert().ShowAlert({ + icon: "success", + title: lang.request_accepted + }); + } + }); + + modal.remove(); }); - new Alert().ShowAlert({ - icon: "success", - title: lang.request_rejected + rejectButton1.addEventListener('click', () => { + fetch('https://api.battlylauncher.com/api/users/rechazarSolicitud', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + username: account.name, + password: account.password, + amigo: solicitud + }) + }).then(res => res.json()).then(res => { + if (res.error) { + console.error(res.error); + + new Alert().ShowAlert({ + icon: "error", + title: lang.error_rejecting_request + }); + } else { + + new Alert().ShowAlert({ + icon: "success", + title: lang.request_rejected + }); + } + }); + + new Alert().ShowAlert({ + icon: "success", + title: lang.request_rejected + }); + + modal.remove(); }); - - modal.remove(); - }); - } catch (error) { + } catch (error) { console.log(`❌ Error al obtener la skin de ${solicitud}.`); - const box1 = document.createElement('div'); - box1.className = 'box'; - box1.style.padding = '0.75rem'; + const box1 = document.createElement('div'); + box1.className = 'box'; + box1.style.padding = '0.75rem'; - const article1 = document.createElement('article'); - article1.className = 'media'; + const article1 = document.createElement('article'); + article1.className = 'media'; - const mediaLeft1 = document.createElement('div'); - mediaLeft1.className = 'media-left'; + const mediaLeft1 = document.createElement('div'); + mediaLeft1.className = 'media-left'; - const img1 = document.createElement('img'); - img1.className = 'mc-face-viewer-5x'; + const img1 = document.createElement('img'); + img1.className = 'mc-face-viewer-5x'; - mediaLeft1.appendChild(img1); + mediaLeft1.appendChild(img1); - const mediaContent1 = document.createElement('div'); - mediaContent1.className = 'media-content'; - mediaContent1.style.margin = '3 auto'; + const mediaContent1 = document.createElement('div'); + mediaContent1.className = 'media-content'; + mediaContent1.style.margin = '3 auto'; - const content1 = document.createElement('div'); - content1.className = 'content'; + const content1 = document.createElement('div'); + content1.className = 'content'; - const userParagraph1 = document.createElement('p'); - userParagraph1.style.fontSize = '30px'; - userParagraph1.textContent = solicitud; + const userParagraph1 = document.createElement('p'); + userParagraph1.style.fontSize = '30px'; + userParagraph1.textContent = solicitud; - content1.appendChild(userParagraph1); - mediaContent1.appendChild(content1); + content1.appendChild(userParagraph1); + mediaContent1.appendChild(content1); - const mediaRight1 = document.createElement('div'); - mediaRight1.className = 'media-right'; - mediaRight1.style.display = 'flex'; - mediaRight1.style.flexDirection = 'column'; - mediaRight1.style.alignItems = 'center'; + const mediaRight1 = document.createElement('div'); + mediaRight1.className = 'media-right'; + mediaRight1.style.display = 'flex'; + mediaRight1.style.flexDirection = 'column'; + mediaRight1.style.alignItems = 'center'; - const acceptButton1 = document.createElement('button'); - acceptButton1.className = 'button is-success is-square'; - acceptButton1.style.height = '30px'; - acceptButton1.style.width = '10px'; - acceptButton1.style.margin = '5px auto'; + const acceptButton1 = document.createElement('button'); + acceptButton1.className = 'button is-success is-square'; + acceptButton1.style.height = '30px'; + acceptButton1.style.width = '10px'; + acceptButton1.style.margin = '5px auto'; - const acceptIcon1 = document.createElement('i'); - acceptIcon1.className = 'fa-solid fa-check'; + const acceptIcon1 = document.createElement('i'); + acceptIcon1.className = 'fa-solid fa-check'; - acceptButton1.appendChild(acceptIcon1); - mediaRight1.appendChild(acceptButton1); + acceptButton1.appendChild(acceptIcon1); + mediaRight1.appendChild(acceptButton1); - const rejectButton1 = document.createElement('button'); - rejectButton1.className = 'button is-danger is-square'; - rejectButton1.style.height = '30px'; - rejectButton1.style.width = '10px'; - rejectButton1.style.marginTop = '5px'; - rejectButton1.style.margin = '5px auto'; + const rejectButton1 = document.createElement('button'); + rejectButton1.className = 'button is-danger is-square'; + rejectButton1.style.height = '30px'; + rejectButton1.style.width = '10px'; + rejectButton1.style.marginTop = '5px'; + rejectButton1.style.margin = '5px auto'; - const rejectIcon1 = document.createElement('i'); - rejectIcon1.className = 'fa-solid fa-xmark'; + const rejectIcon1 = document.createElement('i'); + rejectIcon1.className = 'fa-solid fa-xmark'; - rejectButton1.appendChild(rejectIcon1); - mediaRight1.appendChild(rejectButton1); + rejectButton1.appendChild(rejectIcon1); + mediaRight1.appendChild(rejectButton1); - article1.appendChild(mediaLeft1); - article1.appendChild(mediaContent1); - article1.appendChild(mediaRight1); + article1.appendChild(mediaLeft1); + article1.appendChild(mediaContent1); + article1.appendChild(mediaRight1); - box1.appendChild(article1); + box1.appendChild(article1); - modalBody.appendChild(box1); - img1.style.backgroundImage = "url('https://minotar.net/skin/MHF_Steve.png')"; + modalBody.appendChild(box1); + img1.style.backgroundImage = "url('https://minotar.net/skin/MHF_Steve.png')"; - closeButton.addEventListener('click', () => { - modal.remove(); - }); - - acceptButton1.addEventListener('click', () => { - ipcRenderer.send('aceptar-solicitud', { - username: account.name, - solicitud: solicitud, - password: account.password - }); - - new Alert().ShowAlert({ - icon: "success", - title: lang.request_accepted + closeButton.addEventListener('click', () => { + modal.remove(); }); - modal.remove(); - }); - - rejectButton1.addEventListener('click', () => { - ipcRenderer.send('rechazar-solicitud', { - username: account.name, - solicitud: solicitud, - password: account.password + acceptButton1.addEventListener('click', () => { + fetch('https://api.battlylauncher.com/api/users/aceptarSolicitud', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + username: account.name, + solicitud: solicitud, + password: account.password + }) + }).then(res => res.json()).then(res => { + if (res.error) { + console.error(res.error); + + new Alert().ShowAlert({ + icon: "error", + title: lang.error_accepting_request + }); + } else { + new Alert().ShowAlert({ + icon: "success", + title: lang.request_accepted + }); + } + }); + + new Alert().ShowAlert({ + icon: "success", + title: lang.request_accepted + }); + + modal.remove(); }); - new Alert().ShowAlert({ - icon: "success", - title: lang.request_rejected + rejectButton1.addEventListener('click', () => { + fetch('https://api.battlylauncher.com/api/users/rechazarSolicitud', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + username: account.name, + password: account.password, + amigo: solicitud + }) + }).then(res => res.json()).then(res => { + if (res.error) { + console.error(res.error); + + new Alert().ShowAlert({ + icon: "error", + title: lang.error_rejecting_request + }); + } else { + + new Alert().ShowAlert({ + icon: "success", + title: lang.request_rejected + }); + } + }); + + modal.remove(); }); - - modal.remove(); - }); + } } - } - for (let solicitud of solicitudes.enviadas) { - try { - await axios.get(`https://api.battlylauncher.com/api/skin/${solicitud}.png`) + for (let solicitud of solicitudes.enviadas) { + try { + await axios.get(`https://api.battlylauncher.com/api/skin/${solicitud}.png`) - // Crear el segundo cuadro de solicitud - const box2 = document.createElement('div'); - box2.className = 'box'; - box2.style.padding = '0.75rem'; + // Crear el segundo cuadro de solicitud + const box2 = document.createElement('div'); + box2.className = 'box'; + box2.style.padding = '0.75rem'; - const article2 = document.createElement('article'); - article2.className = 'media'; + const article2 = document.createElement('article'); + article2.className = 'media'; - const mediaLeft2 = document.createElement('div'); - mediaLeft2.className = 'media-left'; + const mediaLeft2 = document.createElement('div'); + mediaLeft2.className = 'media-left'; - const img2 = document.createElement('img'); - img2.className = 'mc-face-viewer-5x'; + const img2 = document.createElement('img'); + img2.className = 'mc-face-viewer-5x'; - mediaLeft2.appendChild(img2); + mediaLeft2.appendChild(img2); - const mediaContent2 = document.createElement('div'); - mediaContent2.className = 'media-content'; - mediaContent2.style.margin = '3 auto'; + const mediaContent2 = document.createElement('div'); + mediaContent2.className = 'media-content'; + mediaContent2.style.margin = '3 auto'; - const content2 = document.createElement('div'); - content2.className = 'content'; + const content2 = document.createElement('div'); + content2.className = 'content'; - const userParagraph2 = document.createElement('p'); - userParagraph2.style.fontSize = '30px'; - userParagraph2.textContent = solicitud; + const userParagraph2 = document.createElement('p'); + userParagraph2.style.fontSize = '30px'; + userParagraph2.textContent = solicitud; - content2.appendChild(userParagraph2); - mediaContent2.appendChild(content2); + content2.appendChild(userParagraph2); + mediaContent2.appendChild(content2); - const mediaRight2 = document.createElement('div'); - mediaRight2.className = 'media-right'; - mediaRight2.style.display = 'flex'; - mediaRight2.style.flexDirection = 'column'; - mediaRight2.style.alignItems = 'center'; + const mediaRight2 = document.createElement('div'); + mediaRight2.className = 'media-right'; + mediaRight2.style.display = 'flex'; + mediaRight2.style.flexDirection = 'column'; + mediaRight2.style.alignItems = 'center'; - const rejectButton2 = document.createElement('button'); - rejectButton2.className = 'button is-danger is-square'; - rejectButton2.style.height = '30px'; - rejectButton2.style.width = '10px'; - rejectButton2.style.marginTop = '5px'; - rejectButton2.style.margin = '5px auto'; + const rejectButton2 = document.createElement('button'); + rejectButton2.className = 'button is-danger is-square'; + rejectButton2.style.height = '30px'; + rejectButton2.style.width = '10px'; + rejectButton2.style.marginTop = '5px'; + rejectButton2.style.margin = '5px auto'; - const rejectIcon2 = document.createElement('i'); - rejectIcon2.className = 'fa-solid fa-ban'; + const rejectIcon2 = document.createElement('i'); + rejectIcon2.className = 'fa-solid fa-ban'; - rejectButton2.appendChild(rejectIcon2); - mediaRight2.appendChild(rejectButton2); + rejectButton2.appendChild(rejectIcon2); + mediaRight2.appendChild(rejectButton2); - article2.appendChild(mediaLeft2); - article2.appendChild(mediaContent2); - article2.appendChild(mediaRight2); + article2.appendChild(mediaLeft2); + article2.appendChild(mediaContent2); + article2.appendChild(mediaRight2); - box2.appendChild(article2); + box2.appendChild(article2); - modalBody.appendChild(box2); - img2.style.backgroundImage = "url('https://api.battlylauncher.com/api/skin/" + solicitud + ".png')"; - } catch (error) { + modalBody.appendChild(box2); + img2.style.backgroundImage = "url('https://api.battlylauncher.com/api/skin/" + solicitud + ".png')"; + } catch (error) { console.log(`❌ Error al obtener la skin de ${solicitud}.`); - // Crear el segundo cuadro de solicitud - const box2 = document.createElement('div'); - box2.className = 'box'; - box2.style.padding = '0.75rem'; + // Crear el segundo cuadro de solicitud + const box2 = document.createElement('div'); + box2.className = 'box'; + box2.style.padding = '0.75rem'; - const article2 = document.createElement('article'); - article2.className = 'media'; + const article2 = document.createElement('article'); + article2.className = 'media'; - const mediaLeft2 = document.createElement('div'); - mediaLeft2.className = 'media-left'; + const mediaLeft2 = document.createElement('div'); + mediaLeft2.className = 'media-left'; - const img2 = document.createElement('img'); - img2.className = 'mc-face-viewer-5x'; + const img2 = document.createElement('img'); + img2.className = 'mc-face-viewer-5x'; - mediaLeft2.appendChild(img2); + mediaLeft2.appendChild(img2); - const mediaContent2 = document.createElement('div'); - mediaContent2.className = 'media-content'; - mediaContent2.style.margin = '3 auto'; + const mediaContent2 = document.createElement('div'); + mediaContent2.className = 'media-content'; + mediaContent2.style.margin = '3 auto'; - const content2 = document.createElement('div'); - content2.className = 'content'; + const content2 = document.createElement('div'); + content2.className = 'content'; - const userParagraph2 = document.createElement('p'); - userParagraph2.style.fontSize = '30px'; - userParagraph2.textContent = solicitud; + const userParagraph2 = document.createElement('p'); + userParagraph2.style.fontSize = '30px'; + userParagraph2.textContent = solicitud; - content2.appendChild(userParagraph2); - mediaContent2.appendChild(content2); + content2.appendChild(userParagraph2); + mediaContent2.appendChild(content2); - const mediaRight2 = document.createElement('div'); - mediaRight2.className = 'media-right'; - mediaRight2.style.display = 'flex'; - mediaRight2.style.flexDirection = 'column'; - mediaRight2.style.alignItems = 'center'; + const mediaRight2 = document.createElement('div'); + mediaRight2.className = 'media-right'; + mediaRight2.style.display = 'flex'; + mediaRight2.style.flexDirection = 'column'; + mediaRight2.style.alignItems = 'center'; - const rejectButton2 = document.createElement('button'); - rejectButton2.className = 'button is-danger is-square'; - rejectButton2.style.height = '30px'; - rejectButton2.style.width = '10px'; - rejectButton2.style.marginTop = '5px'; - rejectButton2.style.margin = '5px auto'; + const rejectButton2 = document.createElement('button'); + rejectButton2.className = 'button is-danger is-square'; + rejectButton2.style.height = '30px'; + rejectButton2.style.width = '10px'; + rejectButton2.style.marginTop = '5px'; + rejectButton2.style.margin = '5px auto'; - const rejectIcon2 = document.createElement('i'); - rejectIcon2.className = 'fa-solid fa-ban'; + const rejectIcon2 = document.createElement('i'); + rejectIcon2.className = 'fa-solid fa-ban'; - rejectButton2.appendChild(rejectIcon2); - mediaRight2.appendChild(rejectButton2); + rejectButton2.appendChild(rejectIcon2); + mediaRight2.appendChild(rejectButton2); - article2.appendChild(mediaLeft2); - article2.appendChild(mediaContent2); - article2.appendChild(mediaRight2); + article2.appendChild(mediaLeft2); + article2.appendChild(mediaContent2); + article2.appendChild(mediaRight2); - box2.appendChild(article2); + box2.appendChild(article2); - modalBody.appendChild(box2); - img2.style.backgroundImage = "url('https://minotar.net/skin/MHF_Steve.png')"; + modalBody.appendChild(box2); + img2.style.backgroundImage = "url('https://minotar.net/skin/MHF_Steve.png')"; + } } } }); @@ -877,635 +979,652 @@ class Friends { const loadingText = document.getElementById("loading-text"); loadingText.innerHTML = lang.loading_friends; - ipcRenderer.send('obtener-amigos', { - username: account.name, - password: account.password - }); + fetch('https://api.battlylauncher.com/api/users/obtenerAmigos', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + username: account.name, + password: account.password + }) + }).then(res => res.json()).then(async res => { + if (res.error) { + console.error(res.error); + new Alert().ShowAlert({ + icon: "error", + title: lang.error_loading_friends + }); + return; + } else { + amigos = res.amigos; + + amigosObtenidos = true; + + if (amigos.length == 0) { + const box = document.createElement('div'); + box.className = 'box'; + box.className = 'box'; + box.style.margin = '0 auto'; - setTimeout(() => { - if (!amigosObtenidos) { - console.log('❌ Error al obtener la lista de amigos. Comprueba tu conexión a internet y vuelve a intentarlo más tarde.'); - const box = document.createElement('div'); - box.className = 'box'; - box.style.margin = '0 auto'; + const article = document.createElement('article'); + article.className = 'media'; - const article = document.createElement('article'); - article.className = 'media'; + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; - const mediaLeft = document.createElement('div'); - mediaLeft.className = 'media-left'; + const content = document.createElement('div'); + content.className = 'content'; - const img = document.createElement('div'); - img.className = 'mc-face-viewer-8x'; - img.style.backgroundImage = "url('https://minotar.net/skin/MHF_Steve.png')"; - mediaLeft.appendChild(img); + let texts = [ + lang.you_dont_have_friends_1, + lang.you_dont_have_friends_2, + lang.you_dont_have_friends_3, + lang.you_dont_have_friends_4, + lang.you_dont_have_friends_5, + lang.you_dont_have_friends_6, + lang.you_dont_have_friends_7, + lang.you_dont_have_friends_8, + ] - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; + let randomText = texts[Math.floor(Math.random() * texts.length)]; - const content = document.createElement('div'); - content.className = 'content'; + const userParagraph = document.createElement('p'); + userParagraph.style.fontSize = '20px'; + userParagraph.textContent = randomText; - const userParagraph = document.createElement('p'); - userParagraph.style.fontSize = '20px'; - userParagraph.textContent = lang.error_loading_friends; - userParagraph.style.textAlign = 'center'; + content.appendChild(userParagraph); + mediaContent.appendChild(content); + + article.appendChild(mediaContent); - content.appendChild(userParagraph); - mediaContent.appendChild(content); + box.appendChild(article); - article.appendChild(mediaContent); + panelAmigos.appendChild(box); - box.appendChild(article); + } - panelAmigos.appendChild(box); - } - }, 10000); + //ordenar los amigos para mostrar los que están ausentes, online y offline + let amigosOrdenados = amigos.sort((a, b) => { + if (a.estado === "ausente" && b.estado === "online") { + return -1; + } else if (a.estado === "ausente" && b.estado === "offline") { + return -1; + } else if (a.estado === "online" && b.estado === "ausente") { + return 1; + } else if (a.estado === "online" && b.estado === "offline") { + return -1; + } else if (a.estado === "offline" && b.estado === "ausente") { + return 1; + } else if (a.estado === "offline" && b.estado === "online") { + return 1; + } else { + //ordenar alfabéticamente ignorando mayúsculas + let nameA = a.username.toUpperCase(); + let nameB = b.username.toUpperCase(); + if (nameA < nameB) { + return -1; + } + if (nameA > nameB) { + return 1; + } + return 0; + } + }); - }); + for (let amigo of amigosOrdenados) { + let username = amigo.username; + let status = amigo.estado; + let details = amigo.details ? amigo.details : 'Offline'; - let amigosOnline = []; - let amigosAusente = []; - let amigosOffline = []; - ipcRenderer.on('amigos', async (e, amigos) => { + if (status === "online") { + try { + await axios.get(`https://api.battlylauncher.com/api/skin/${username}.png`) - amigosObtenidos = true; - - if (amigos.length == 0) { - const box = document.createElement('div'); - box.className = 'box'; - box.className = 'box'; - box.style.margin = '0 auto'; + + const box = document.createElement('div'); + box.className = 'box friend-card'; - const article = document.createElement('article'); - article.className = 'media'; + const article = document.createElement('article'); + article.className = 'media'; - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; + const mediaLeft = document.createElement('div'); + mediaLeft.className = 'media-left'; + mediaLeft.style.marginRight = '-1rem'; + mediaLeft.style.marginLeft = '-2rem'; - const content = document.createElement('div'); - content.className = 'content'; + const figure = document.createElement('figure'); + figure.className = 'image is-64x64'; - let texts = [ - lang.you_dont_have_friends_1, - lang.you_dont_have_friends_2, - lang.you_dont_have_friends_3, - lang.you_dont_have_friends_4, - lang.you_dont_have_friends_5, - lang.you_dont_have_friends_6, - lang.you_dont_have_friends_7, - lang.you_dont_have_friends_8, - ] + const img = document.createElement('div'); + img.className = 'mc-face-viewer-8x'; + img.alt = 'Image'; + img.style.borderRadius = '5px'; - let randomText = texts[Math.floor(Math.random() * texts.length)]; + const statusOverlay = document.createElement('div'); + statusOverlay.className = 'status-overlay'; - const userParagraph = document.createElement('p'); - userParagraph.style.fontSize = '20px'; - userParagraph.textContent = randomText; + const statusImg = document.createElement('img'); + statusImg.src = 'assets/images/icon.png'; + statusImg.alt = 'Status'; + statusImg.style.width = '25px'; + statusImg.style.borderRadius = '5px'; - content.appendChild(userParagraph); - mediaContent.appendChild(content); - - article.appendChild(mediaContent); - - box.appendChild(article); - - panelAmigos.appendChild(box); - - } - - //ordenar los amigos para mostrar los que están ausentes, online y offline - let amigosOrdenados = amigos.sort((a, b) => { - if (a.estado === "ausente" && b.estado === "online") { - return -1; - } else if (a.estado === "ausente" && b.estado === "offline") { - return -1; - } else if (a.estado === "online" && b.estado === "ausente") { - return 1; - } else if (a.estado === "online" && b.estado === "offline") { - return -1; - } else if (a.estado === "offline" && b.estado === "ausente") { - return 1; - } else if (a.estado === "offline" && b.estado === "online") { - return 1; - } else { - //ordenar alfabéticamente ignorando mayúsculas - let nameA = a.username.toUpperCase(); - let nameB = b.username.toUpperCase(); - if (nameA < nameB) { - return -1; - } - if (nameA > nameB) { - return 1; - } - return 0; - } - }); + statusOverlay.appendChild(statusImg); + figure.appendChild(img); + figure.appendChild(statusOverlay); + mediaLeft.appendChild(figure); - for (let amigo of amigosOrdenados) { - let username = amigo.username; - let status = amigo.estado; - let details = amigo.details ? amigo.details : 'Offline'; + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; - if (status === "online") { - try { - await axios.get(`https://api.battlylauncher.com/api/skin/${username}.png`) + const content = document.createElement('div'); + content.className = 'content'; - - const box = document.createElement('div'); - box.className = 'box friend-card'; + const strong = document.createElement('strong'); + strong.className = 'friend-username'; + strong.textContent = username; - const article = document.createElement('article'); - article.className = 'media'; + const span = document.createElement('span'); + span.style.marginLeft = '3px'; - const mediaLeft = document.createElement('div'); - mediaLeft.className = 'media-left'; - mediaLeft.style.marginRight = '-1rem'; - mediaLeft.style.marginLeft = '-2rem'; + const statusImg2 = document.createElement('img'); + statusImg2.src = 'assets/images/status/online.png'; + statusImg2.alt = ''; + statusImg2.style.width = '15px'; + statusImg2.style.display = 'inline'; - const figure = document.createElement('figure'); - figure.className = 'image is-64x64'; + span.appendChild(statusImg2); - const img = document.createElement('div'); - img.className = 'mc-face-viewer-8x'; - img.alt = 'Image'; - img.style.borderRadius = '5px'; + const br = document.createElement('br'); - const statusOverlay = document.createElement('div'); - statusOverlay.className = 'status-overlay'; + const status = document.createElement('span'); + status.textContent = lang.in_the_main_menu; - const statusImg = document.createElement('img'); - statusImg.src = 'assets/images/icon.png'; - statusImg.alt = 'Status'; - statusImg.style.width = '25px'; - statusImg.style.borderRadius = '5px'; + // Agregamos la etiqueta

y colocamos strong, span, br y status dentro de ella + const paragraph = document.createElement('p'); + paragraph.appendChild(strong); + paragraph.appendChild(span); + paragraph.appendChild(br); + paragraph.appendChild(status); - statusOverlay.appendChild(statusImg); - figure.appendChild(img); - figure.appendChild(statusOverlay); - mediaLeft.appendChild(figure); + content.appendChild(paragraph); + mediaContent.appendChild(content); - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; + article.appendChild(mediaLeft); + article.appendChild(mediaContent); - const content = document.createElement('div'); - content.className = 'content'; + box.appendChild(article); - const strong = document.createElement('strong'); - strong.className = 'friend-username'; - strong.textContent = username; + panelAmigos.appendChild(box); + img.style.backgroundImage = `url('https://api.battlylauncher.com/api/skin/${username}.png')`; - const span = document.createElement('span'); - span.style.marginLeft = '3px'; + } catch (error) { + console.log(`❌ Error al obtener la skin de ${username}.`); - const statusImg2 = document.createElement('img'); - statusImg2.src = 'assets/images/status/online.png'; - statusImg2.alt = ''; - statusImg2.style.width = '15px'; - statusImg2.style.display = 'inline'; + const box = document.createElement('div'); + box.className = 'box friend-card'; - span.appendChild(statusImg2); + const article = document.createElement('article'); + article.className = 'media'; - const br = document.createElement('br'); + const mediaLeft = document.createElement('div'); + mediaLeft.className = 'media-left'; + mediaLeft.style.marginRight = '-1rem'; + mediaLeft.style.marginLeft = '-2rem'; - const status = document.createElement('span'); - status.textContent = lang.in_the_main_menu; + const figure = document.createElement('figure'); + figure.className = 'image is-64x64'; - // Agregamos la etiqueta

y colocamos strong, span, br y status dentro de ella - const paragraph = document.createElement('p'); - paragraph.appendChild(strong); - paragraph.appendChild(span); - paragraph.appendChild(br); - paragraph.appendChild(status); + const img = document.createElement('div'); + img.className = 'mc-face-viewer-8x'; + img.alt = 'Image'; + img.style.borderRadius = '5px'; - content.appendChild(paragraph); - mediaContent.appendChild(content); + const statusOverlay = document.createElement('div'); + statusOverlay.className = 'status-overlay'; - article.appendChild(mediaLeft); - article.appendChild(mediaContent); + const statusImg = document.createElement('img'); + statusImg.src = 'assets/images/icon.png'; + statusImg.alt = 'Status'; + statusImg.style.width = '25px'; + statusImg.style.borderRadius = '5px'; - box.appendChild(article); + statusOverlay.appendChild(statusImg); + figure.appendChild(img); + figure.appendChild(statusOverlay); + mediaLeft.appendChild(figure); - panelAmigos.appendChild(box); - img.style.backgroundImage = `url('https://api.battlylauncher.com/api/skin/${username}.png')`; + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; - } catch (error) { - console.log(`❌ Error al obtener la skin de ${username}.`); + const content = document.createElement('div'); + content.className = 'content'; - const box = document.createElement('div'); - box.className = 'box friend-card'; + const strong = document.createElement('strong'); + strong.className = 'friend-username'; + strong.textContent = username; - const article = document.createElement('article'); - article.className = 'media'; + const span = document.createElement('span'); + span.style.marginLeft = '3px'; - const mediaLeft = document.createElement('div'); - mediaLeft.className = 'media-left'; - mediaLeft.style.marginRight = '-1rem'; - mediaLeft.style.marginLeft = '-2rem'; + const statusImg2 = document.createElement('img'); + statusImg2.src = 'assets/images/status/online.png'; + statusImg2.alt = ''; + statusImg2.style.width = '15px'; + statusImg2.style.display = 'inline'; - const figure = document.createElement('figure'); - figure.className = 'image is-64x64'; + span.appendChild(statusImg2); - const img = document.createElement('div'); - img.className = 'mc-face-viewer-8x'; - img.alt = 'Image'; - img.style.borderRadius = '5px'; + const br = document.createElement('br'); - const statusOverlay = document.createElement('div'); - statusOverlay.className = 'status-overlay'; + const status = document.createElement('span'); + status.textContent = lang.in_the_main_menu; - const statusImg = document.createElement('img'); - statusImg.src = 'assets/images/icon.png'; - statusImg.alt = 'Status'; - statusImg.style.width = '25px'; - statusImg.style.borderRadius = '5px'; + // Agregamos la etiqueta

y colocamos strong, span, br y status dentro de ella + const paragraph = document.createElement('p'); + paragraph.appendChild(strong); + paragraph.appendChild(span); + paragraph.appendChild(br); + paragraph.appendChild(status); - statusOverlay.appendChild(statusImg); - figure.appendChild(img); - figure.appendChild(statusOverlay); - mediaLeft.appendChild(figure); + content.appendChild(paragraph); + mediaContent.appendChild(content); - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; + article.appendChild(mediaLeft); + article.appendChild(mediaContent); - const content = document.createElement('div'); - content.className = 'content'; + box.appendChild(article); - const strong = document.createElement('strong'); - strong.className = 'friend-username'; - strong.textContent = username; + panelAmigos.appendChild(box); + img.style.backgroundImage = `url('https://minotar.net/skin/MHF_Steve.png')`; + } - const span = document.createElement('span'); - span.style.marginLeft = '3px'; + } else if (status === "ausente") { + + let version; + let icon; + + if (details.includes("Forge")) { + version = "Forge"; + icon = "./assets/images/icons/forge.png"; + } else if (details.includes("Fabric")) { + version = "Fabric"; + icon = "./assets/images/icons/fabric.png"; + } else if (details.includes("Quilt")) { + version = "Quilt"; + icon = "./assets/images/icons/quilt.png"; + } else if (details.includes("OptiFine")) { + version = "OptiFine"; + icon = "./assets/images/icons/optifine.png"; + } else if (details.includes("Vanilla")) { + version = "Vanilla"; + icon = "./assets/images/icons/minecraft.png"; + } else if (details.includes("LabyMod")) { + version = "LabyMod"; + icon = "https://battlylauncher.com/assets/img/labymod.png"; + } else if (details.includes("CMPack")) { + version = "CMPack"; + icon = "./assets/images/icons/cmpack.png"; + } else if (details.includes("Ares")) { + version = "Ares"; + icon = "./assets/images/icons/ares.png"; + } else if (details.includes("BatMod")) { + version = "BatMod"; + icon = "./assets/images/icons/batmod.png"; + } else if (details.includes("Battly")) { + version = "Battly"; + icon = "./assets/images/icon.png"; + } else { + version = "Desconocida"; + icon = "./assets/images/icons/minecraft.png"; + } + + try { + await axios.get(`https://api.battlylauncher.com/api/skin/${username}.png`) + + const box = document.createElement('div'); + box.className = 'box friend-card'; + + const article = document.createElement('article'); + article.className = 'media'; + + const mediaLeft = document.createElement('div'); + mediaLeft.className = 'media-left'; + mediaLeft.style.marginRight = '-1rem'; + mediaLeft.style.marginLeft = '-2rem'; + + const figure = document.createElement('figure'); + figure.className = 'image is-64x64'; + + const img = document.createElement('div'); + img.className = 'mc-face-viewer-8x'; + img.alt = 'Image'; + img.style.borderRadius = '5px'; + + const statusOverlay = document.createElement('div'); + statusOverlay.className = 'status-overlay'; + + const statusImg = document.createElement('img'); + statusImg.src = icon; + statusImg.alt = 'Status'; + statusImg.style.width = '25px'; + statusImg.style.borderRadius = '5px'; + + statusOverlay.appendChild(statusImg); + figure.appendChild(img); + figure.appendChild(statusOverlay); + mediaLeft.appendChild(figure); - const statusImg2 = document.createElement('img'); - statusImg2.src = 'assets/images/status/online.png'; - statusImg2.alt = ''; - statusImg2.style.width = '15px'; - statusImg2.style.display = 'inline'; + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; + + const content = document.createElement('div'); + content.className = 'content'; - span.appendChild(statusImg2); + const strong = document.createElement('strong'); + strong.className = 'friend-username'; + strong.textContent = username; - const br = document.createElement('br'); + const span = document.createElement('span'); + span.style.marginLeft = '3px'; - const status = document.createElement('span'); - status.textContent = lang.in_the_main_menu; + const statusImg2 = document.createElement('img'); + statusImg2.src = 'assets/images/status/idle.png'; + statusImg2.alt = ''; + statusImg2.style.width = '15px'; + statusImg2.style.display = 'inline'; - // Agregamos la etiqueta

y colocamos strong, span, br y status dentro de ella - const paragraph = document.createElement('p'); - paragraph.appendChild(strong); - paragraph.appendChild(span); - paragraph.appendChild(br); - paragraph.appendChild(status); + span.appendChild(statusImg2); - content.appendChild(paragraph); - mediaContent.appendChild(content); + const br = document.createElement('br'); - article.appendChild(mediaLeft); - article.appendChild(mediaContent); + const status = document.createElement('span'); + status.textContent = details; - box.appendChild(article); + const paragraph = document.createElement('p'); + paragraph.appendChild(strong); + paragraph.appendChild(span); + paragraph.appendChild(br); + paragraph.appendChild(status); - panelAmigos.appendChild(box); - img.style.backgroundImage = `url('https://minotar.net/skin/MHF_Steve.png')`; - } + content.appendChild(paragraph); + mediaContent.appendChild(content); - } else if (status === "ausente") { - - let version; - let icon; - - if (details.includes("Forge")) { - version = "Forge"; - icon = "./assets/images/icons/forge.png"; - } else if (details.includes("Fabric")) { - version = "Fabric"; - icon = "./assets/images/icons/fabric.png"; - } else if (details.includes("Quilt")) { - version = "Quilt"; - icon = "./assets/images/icons/quilt.png"; - } else if (details.includes("OptiFine")) { - version = "OptiFine"; - icon = "./assets/images/icons/optifine.png"; - } else if (details.includes("Vanilla")) { - version = "Vanilla"; - icon = "./assets/images/icons/minecraft.png"; - } else if (details.includes("LabyMod")) { - version = "LabyMod"; - icon = "https://battlylauncher.com/assets/img/labymod.png"; - } else if (details.includes("CMPack")) { - version = "CMPack"; - icon = "./assets/images/icons/cmpack.png"; - } else if (details.includes("Ares")) { - version = "Ares"; - icon = "./assets/images/icons/ares.png"; - } else if (details.includes("BatMod")) { - version = "BatMod"; - icon = "./assets/images/icons/batmod.png"; - } else if (details.includes("Battly")) { - version = "Battly"; - icon = "./assets/images/icon.png"; - } else { - version = "Desconocida"; - icon = "./assets/images/icons/minecraft.png"; - } + article.appendChild(mediaLeft); + article.appendChild(mediaContent); - try { - await axios.get(`https://api.battlylauncher.com/api/skin/${username}.png`) + box.appendChild(article); - const box = document.createElement('div'); - box.className = 'box friend-card'; + panelAmigos.appendChild(box); + img.style.backgroundImage = `url('https://api.battlylauncher.com/api/skin/${username}.png')`; + } catch (error) { + console.log(`❌ Error al obtener la skin de ${username}.`); + const box = document.createElement('div'); + box.className = 'box friend-card'; - const article = document.createElement('article'); - article.className = 'media'; + const article = document.createElement('article'); + article.className = 'media'; - const mediaLeft = document.createElement('div'); - mediaLeft.className = 'media-left'; - mediaLeft.style.marginRight = '-1rem'; - mediaLeft.style.marginLeft = '-2rem'; + const mediaLeft = document.createElement('div'); + mediaLeft.className = 'media-left'; + mediaLeft.style.marginRight = '-1rem'; + mediaLeft.style.marginLeft = '-2rem'; - const figure = document.createElement('figure'); - figure.className = 'image is-64x64'; + const figure = document.createElement('figure'); + figure.className = 'image is-64x64'; - const img = document.createElement('div'); - img.className = 'mc-face-viewer-8x'; - img.alt = 'Image'; - img.style.borderRadius = '5px'; + const img = document.createElement('div'); + img.className = 'mc-face-viewer-8x'; + img.alt = 'Image'; + img.style.borderRadius = '5px'; - const statusOverlay = document.createElement('div'); - statusOverlay.className = 'status-overlay'; + const statusOverlay = document.createElement('div'); + statusOverlay.className = 'status-overlay'; - const statusImg = document.createElement('img'); - statusImg.src = icon; - statusImg.alt = 'Status'; - statusImg.style.width = '25px'; - statusImg.style.borderRadius = '5px'; + const statusImg = document.createElement('img'); + statusImg.src = icon; + statusImg.alt = 'Status'; + statusImg.style.width = '25px'; + statusImg.style.borderRadius = '5px'; - statusOverlay.appendChild(statusImg); - figure.appendChild(img); - figure.appendChild(statusOverlay); - mediaLeft.appendChild(figure); + statusOverlay.appendChild(statusImg); + figure.appendChild(img); + figure.appendChild(statusOverlay); + mediaLeft.appendChild(figure); - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; - const content = document.createElement('div'); - content.className = 'content'; + const content = document.createElement('div'); + content.className = 'content'; - const strong = document.createElement('strong'); - strong.className = 'friend-username'; - strong.textContent = username; + const strong = document.createElement('strong'); + strong.className = 'friend-username'; + strong.textContent = username; - const span = document.createElement('span'); - span.style.marginLeft = '3px'; + const span = document.createElement('span'); + span.style.marginLeft = '3px'; - const statusImg2 = document.createElement('img'); - statusImg2.src = 'assets/images/status/idle.png'; - statusImg2.alt = ''; - statusImg2.style.width = '15px'; - statusImg2.style.display = 'inline'; + const statusImg2 = document.createElement('img'); + statusImg2.src = 'assets/images/status/idle.png'; + statusImg2.alt = ''; + statusImg2.style.width = '15px'; + statusImg2.style.display = 'inline'; - span.appendChild(statusImg2); + span.appendChild(statusImg2); - const br = document.createElement('br'); + const br = document.createElement('br'); - const status = document.createElement('span'); - status.textContent = details; + const status = document.createElement('span'); + status.textContent = details; - const paragraph = document.createElement('p'); - paragraph.appendChild(strong); - paragraph.appendChild(span); - paragraph.appendChild(br); - paragraph.appendChild(status); + const paragraph = document.createElement('p'); + paragraph.appendChild(strong); + paragraph.appendChild(span); + paragraph.appendChild(br); + paragraph.appendChild(status); - content.appendChild(paragraph); - mediaContent.appendChild(content); + content.appendChild(paragraph); + mediaContent.appendChild(content); - article.appendChild(mediaLeft); - article.appendChild(mediaContent); + article.appendChild(mediaLeft); + article.appendChild(mediaContent); - box.appendChild(article); + box.appendChild(article); - panelAmigos.appendChild(box); - img.style.backgroundImage = `url('https://api.battlylauncher.com/api/skin/${username}.png')`; - } catch (error) { - console.log(`❌ Error al obtener la skin de ${username}.`); - const box = document.createElement('div'); - box.className = 'box friend-card'; + panelAmigos.appendChild(box); + img.style.backgroundImage = `url('https://minotar.net/skin/MHF_Steve.png')`; + } - const article = document.createElement('article'); - article.className = 'media'; + } else { + try { + await axios.get(`https://api.battlylauncher.com/api/skin/${username}.png`) + + const box = document.createElement('div'); + box.className = 'box friend-card'; - const mediaLeft = document.createElement('div'); - mediaLeft.className = 'media-left'; - mediaLeft.style.marginRight = '-1rem'; - mediaLeft.style.marginLeft = '-2rem'; + const article = document.createElement('article'); + article.className = 'media'; - const figure = document.createElement('figure'); - figure.className = 'image is-64x64'; + const mediaLeft = document.createElement('div'); + mediaLeft.className = 'media-left'; + mediaLeft.style.marginRight = '-1rem'; + mediaLeft.style.marginLeft = '-2rem'; - const img = document.createElement('div'); - img.className = 'mc-face-viewer-8x'; - img.alt = 'Image'; - img.style.borderRadius = '5px'; + const figure = document.createElement('figure'); + figure.className = 'image is-64x64'; - const statusOverlay = document.createElement('div'); - statusOverlay.className = 'status-overlay'; + const img = document.createElement('div'); + img.className = 'mc-face-viewer-8x'; + img.alt = 'Image'; + img.style.borderRadius = '5px'; - const statusImg = document.createElement('img'); - statusImg.src = icon; - statusImg.alt = 'Status'; - statusImg.style.width = '25px'; - statusImg.style.borderRadius = '5px'; - - statusOverlay.appendChild(statusImg); - figure.appendChild(img); - figure.appendChild(statusOverlay); - mediaLeft.appendChild(figure); + figure.appendChild(img); + mediaLeft.appendChild(figure); - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; - - const content = document.createElement('div'); - content.className = 'content'; + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; - const strong = document.createElement('strong'); - strong.className = 'friend-username'; - strong.textContent = username; + const content = document.createElement('div'); + content.className = 'content'; - const span = document.createElement('span'); - span.style.marginLeft = '3px'; + const strong = document.createElement('strong'); + strong.className = 'friend-username'; + strong.textContent = username; - const statusImg2 = document.createElement('img'); - statusImg2.src = 'assets/images/status/idle.png'; - statusImg2.alt = ''; - statusImg2.style.width = '15px'; - statusImg2.style.display = 'inline'; + const span = document.createElement('span'); + span.style.marginLeft = '3px'; - span.appendChild(statusImg2); + const statusImg = document.createElement('img'); + statusImg.src = 'assets/images/status/offline.png'; + statusImg.alt = ''; + statusImg.style.width = '15px'; + statusImg.style.display = 'inline'; - const br = document.createElement('br'); + span.appendChild(statusImg); - const status = document.createElement('span'); - status.textContent = details; + const br = document.createElement('br'); - const paragraph = document.createElement('p'); - paragraph.appendChild(strong); - paragraph.appendChild(span); - paragraph.appendChild(br); - paragraph.appendChild(status); + const status = document.createElement('span'); + status.textContent = 'Offline'; - content.appendChild(paragraph); - mediaContent.appendChild(content); + const paragraph = document.createElement('p'); + paragraph.appendChild(strong); + paragraph.appendChild(span); + paragraph.appendChild(br); + paragraph.appendChild(status); - article.appendChild(mediaLeft); - article.appendChild(mediaContent); + content.appendChild(paragraph); + mediaContent.appendChild(content); - box.appendChild(article); + article.appendChild(mediaLeft); + article.appendChild(mediaContent); - panelAmigos.appendChild(box); - img.style.backgroundImage = `url('https://minotar.net/skin/MHF_Steve.png')`; - } + box.appendChild(article); - } else { - try { - await axios.get(`https://api.battlylauncher.com/api/skin/${username}.png`) + panelAmigos.appendChild(box); + img.style.backgroundImage = `url('https://api.battlylauncher.com/api/skin/${username}.png')`; + } - const box = document.createElement('div'); - box.className = 'box friend-card'; + catch (error) { + console.log(`❌ Error al obtener la skin de ${username}.`); + const box = document.createElement('div'); + box.className = 'box friend-card'; - const article = document.createElement('article'); - article.className = 'media'; + const article = document.createElement('article'); + article.className = 'media'; - const mediaLeft = document.createElement('div'); - mediaLeft.className = 'media-left'; - mediaLeft.style.marginRight = '-1rem'; - mediaLeft.style.marginLeft = '-2rem'; + const mediaLeft = document.createElement('div'); + mediaLeft.className = 'media-left'; + mediaLeft.style.marginRight = '-1rem'; + mediaLeft.style.marginLeft = '-2rem'; - const figure = document.createElement('figure'); - figure.className = 'image is-64x64'; + const figure = document.createElement('figure'); + figure.className = 'image is-64x64'; - const img = document.createElement('div'); - img.className = 'mc-face-viewer-8x'; - img.alt = 'Image'; - img.style.borderRadius = '5px'; + const img = document.createElement('div'); + img.className = 'mc-face-viewer-8x'; + img.alt = 'Image'; + img.style.borderRadius = '5px'; - figure.appendChild(img); - mediaLeft.appendChild(figure); + figure.appendChild(img); + mediaLeft.appendChild(figure); - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; - const content = document.createElement('div'); - content.className = 'content'; + const content = document.createElement('div'); + content.className = 'content'; - const strong = document.createElement('strong'); - strong.className = 'friend-username'; - strong.textContent = username; + const strong = document.createElement('strong'); + strong.className = 'friend-username'; + strong.textContent = username; - const span = document.createElement('span'); - span.style.marginLeft = '3px'; + const span = document.createElement('span'); + span.style.marginLeft = '3px'; - const statusImg = document.createElement('img'); - statusImg.src = 'assets/images/status/offline.png'; - statusImg.alt = ''; - statusImg.style.width = '15px'; - statusImg.style.display = 'inline'; + const statusImg = document.createElement('img'); + statusImg.src = 'assets/images/status/offline.png'; + statusImg.alt = ''; + statusImg.style.width = '15px'; + statusImg.style.display = 'inline'; - span.appendChild(statusImg); + span.appendChild(statusImg); - const br = document.createElement('br'); + const br = document.createElement('br'); - const status = document.createElement('span'); - status.textContent = 'Offline'; + const status = document.createElement('span'); + status.textContent = 'Offline'; - const paragraph = document.createElement('p'); - paragraph.appendChild(strong); - paragraph.appendChild(span); - paragraph.appendChild(br); - paragraph.appendChild(status); + const paragraph = document.createElement('p'); + paragraph.appendChild(strong); + paragraph.appendChild(span); + paragraph.appendChild(br); + paragraph.appendChild(status); - content.appendChild(paragraph); - mediaContent.appendChild(content); + content.appendChild(paragraph); + mediaContent.appendChild(content); - article.appendChild(mediaLeft); - article.appendChild(mediaContent); + article.appendChild(mediaLeft); + article.appendChild(mediaContent); - box.appendChild(article); + box.appendChild(article); - panelAmigos.appendChild(box); - img.style.backgroundImage = `url('https://api.battlylauncher.com/api/skin/${username}.png')`; + panelAmigos.appendChild(box); + img.style.backgroundImage = `url('https://minotar.net/skin/MHF_Steve.png')`; + } + } } - - catch (error) { - console.log(`❌ Error al obtener la skin de ${username}.`); - const box = document.createElement('div'); - box.className = 'box friend-card'; - - const article = document.createElement('article'); - article.className = 'media'; - - const mediaLeft = document.createElement('div'); - mediaLeft.className = 'media-left'; - mediaLeft.style.marginRight = '-1rem'; - mediaLeft.style.marginLeft = '-2rem'; - - const figure = document.createElement('figure'); - figure.className = 'image is-64x64'; - - const img = document.createElement('div'); - img.className = 'mc-face-viewer-8x'; - img.alt = 'Image'; - img.style.borderRadius = '5px'; - - figure.appendChild(img); - mediaLeft.appendChild(figure); - - const mediaContent = document.createElement('div'); - mediaContent.className = 'media-content'; - - const content = document.createElement('div'); - content.className = 'content'; + } + }).catch(err => { + console.error(err); + new Alert().ShowAlert({ + icon: "error", + title: lang.error_loading_friends + }); + }); - const strong = document.createElement('strong'); - strong.className = 'friend-username'; - strong.textContent = username; + setTimeout(() => { + if (!amigosObtenidos) { + console.log('❌ Error al obtener la lista de amigos. Comprueba tu conexión a internet y vuelve a intentarlo más tarde.'); + const box = document.createElement('div'); + box.className = 'box'; + box.style.margin = '0 auto'; - const span = document.createElement('span'); - span.style.marginLeft = '3px'; + const article = document.createElement('article'); + article.className = 'media'; - const statusImg = document.createElement('img'); - statusImg.src = 'assets/images/status/offline.png'; - statusImg.alt = ''; - statusImg.style.width = '15px'; - statusImg.style.display = 'inline'; + const mediaLeft = document.createElement('div'); + mediaLeft.className = 'media-left'; - span.appendChild(statusImg); + const img = document.createElement('div'); + img.className = 'mc-face-viewer-8x'; + img.style.backgroundImage = "url('https://minotar.net/skin/MHF_Steve.png')"; + mediaLeft.appendChild(img); - const br = document.createElement('br'); + const mediaContent = document.createElement('div'); + mediaContent.className = 'media-content'; - const status = document.createElement('span'); - status.textContent = 'Offline'; + const content = document.createElement('div'); + content.className = 'content'; - const paragraph = document.createElement('p'); - paragraph.appendChild(strong); - paragraph.appendChild(span); - paragraph.appendChild(br); - paragraph.appendChild(status); + const userParagraph = document.createElement('p'); + userParagraph.style.fontSize = '20px'; + userParagraph.textContent = lang.error_loading_friends; + userParagraph.style.textAlign = 'center'; - content.appendChild(paragraph); - mediaContent.appendChild(content); + content.appendChild(userParagraph); + mediaContent.appendChild(content); - article.appendChild(mediaLeft); - article.appendChild(mediaContent); + article.appendChild(mediaContent); - box.appendChild(article); + box.appendChild(article); - panelAmigos.appendChild(box); - img.style.backgroundImage = `url('https://minotar.net/skin/MHF_Steve.png')`; - } + panelAmigos.appendChild(box); } - } + }, 10000); + }); } } diff --git a/src/assets/js/panels/home.js b/src/assets/js/panels/home.js index c93fc3d..b776103 100644 --- a/src/assets/js/panels/home.js +++ b/src/assets/js/panels/home.js @@ -245,7 +245,8 @@ class Home { const modalCard = document.createElement("div"); modalCard.classList.add("modal-card"); modalCard.style.backgroundColor = "#212121"; - modalCard.style.height = "85%"; + modalCard.style.height = "auto"; + modalCard.style.maxHeight = "85%"; // Crear el encabezado del modal const modalHeader = document.createElement("header"); @@ -785,7 +786,7 @@ class Home { }); }, 500); - versionSelect.addEventListener("change", async () => { + versionSelect.addEventListener("change", async () => { versionOptionsVersion.innerHTML = ""; let optionLoading = document.createElement("option"); optionLoading.value = "loading"; @@ -999,7 +1000,7 @@ class Home { if (instance_json.loader) loader_json = instance_json.loader; let loaderVersion; - if (instance_json) loaderVersion = instance_json.loaderVersion; + if (instance_json) loaderVersion = instance_json.loaderVersion; if ( instance_json.version.endsWith("-forge") || @@ -1014,6 +1015,12 @@ class Home { version = instance_json.version; } + + if (!loaderVersion.includes(version)) { + console.log(`Cambiando de ${loaderVersion} a ${version}-${loaderVersion}`); + loaderVersion = `${version}-${loaderVersion}`; + } + let launch = new Launch(); let opts; @@ -1028,7 +1035,7 @@ class Home { detached: true, timeout: 10000, path: `${dataDirectory}/.battly/instances/${instancias[i]}`, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: version, loader: { type: loader_json ? loader_json : loader, @@ -1060,7 +1067,7 @@ class Home { detached: true, timeout: 10000, path: `${dataDirectory}/.battly/instances/${instancias[i]}`, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: version, loader: { type: loader_json ? loader_json : loader, @@ -2247,25 +2254,13 @@ class Home { buttons.forEach((button) => { button.style.backgroundColor = color; button.addEventListener("mouseover", () => { - const span = button.querySelector("span"); colorHover = localStorage.getItem("theme-color-hover"); button.style.backgroundColor = colorHover; - if (span) { - span.classList.add("animate__animated") - span.classList.add("animate__infinite") - span.classList.add("animate__pulse") - } }); button.addEventListener("mouseout", () => { - const span = button.querySelector("span"); color = localStorage.getItem("theme-color"); button.style.backgroundColor = color; - if (span) { - span.classList.remove("animate__animated") - span.classList.remove("animate__infinite") - span.classList.remove("animate__pulse") - } }); }); @@ -2331,15 +2326,11 @@ class Home { accounts.forEach((account) => { account.style.backgroundColor = color; - //si contiene la clase active-account if (!account.classList.contains("active-account")) { - //hacer que el border sea el mismo color pero más oscuro let colorOscuro = tinycolor(color).darken(10).toString(); account.style.border = `4px solid ${colorOscuro}`; } else { - //hacer que el hover sea el mismo color pero más oscuro let colorOscuro = tinycolor(color).darken(10).toString(); - //hover account.addEventListener("mouseover", () => { account.style.border = `4px solid ${colorOscuro}`; }); @@ -2385,7 +2376,6 @@ class Home { try { let versiones_nuevas = fs.readdirSync(dataDirectory + "/.battly/versions"); - // Filtrar solo las carpetas versiones_nuevas = versiones_nuevas.filter(version => { let fullPath = path.join(dataDirectory, "/.battly/versions", version); return fs.statSync(fullPath).isDirectory(); @@ -2405,9 +2395,7 @@ class Home { if (!versions_vanilla.includes(version)) { let option = document.createElement("option"); - // si contiene OptiFine- eliminar todo lo que vaya después de OptiFine pero incluir la palabra OptiFine if (version.includes("OptiFine_")) { - // Usa una expresión regular para eliminar todo después de "OptiFine" y agrega "OptiFine" let version_optifine = version.replace(/OptiFine.*$/, "OptiFine"); option.value = version + `-extra`; option.innerHTML = version_optifine; @@ -2448,83 +2436,54 @@ class Home { } async initConfig() { - let config = this.BattlyConfig; - let config_json = JSON.stringify(config); - fs.mkdirSync( - `${dataDirectory}/${ - process.platform == "darwin" - ? this.config.dataDirectory - : `.${this.config.dataDirectory}` - }`, - { - recursive: true, - } - ); - fs.mkdirSync( - `${dataDirectory}/${ - process.platform == "darwin" - ? this.config.dataDirectory - : `.${this.config.dataDirectory}` - }/versions`, - { - recursive: true, - } - ); - let versionsConfig = this.Versions; - let config_json_versions = JSON.stringify(versionsConfig); - fs.mkdirSync( - `${dataDirectory}/${ - process.platform == "darwin" - ? this.config.dataDirectory - : `.${this.config.dataDirectory}` - }`, - { - recursive: true, - } - ); + if (!fs.existsSync(`${dataDirectory}/.battly`)) { + fs.mkdirSync(`${dataDirectory}/.battly`); + } else if (!fs.existsSync(`${dataDirectory}/.battly/instances`)) { + fs.mkdirSync(`${dataDirectory}/.battly/instances`); + } else if (!fs.existsSync(`${dataDirectory}/.battly/versions`)) { + fs.mkdirSync(`${dataDirectory}/.battly/versions`); + }; - document.getElementById( - "instancias-btn" - ).innerHTML = ` ${langs.instances}`; - document.getElementById( - "download-btn" - ).innerHTML = ` ${langs.download}`; - document.getElementById( - "play-btn" - ).innerHTML = ` ${langs.play}`; - document.getElementById("news-battly").innerHTML = `${langs.news_battly}`; - document.getElementById( - "status-battly" - ).innerHTML = `${langs.status_battly}`; - document.getElementById( - "playing-now-text" - ).innerHTML = `${langs.playing_now_text}`; - document.getElementById( - "playing-now-body" - ).innerHTML = `${langs.playing_now_body}`; - document.getElementById("ads-text").innerHTML = `${langs.ads_text}`; + document.getElementById("instancias-txt").innerHTML += ` ${langs.instances}`; + document.getElementById("download-txt").innerHTML += ` ${langs.download}`; + document.getElementById("play-txt").innerHTML += ` ${langs.play}`; + document.getElementById("news-battly").innerHTML = langs.news_battly; + document.getElementById("status-battly").innerHTML = langs.status_battly; + document.getElementById("playing-now-text").innerHTML = langs.playing_now_text; + document.getElementById("playing-now-body").innerHTML = langs.playing_now_body; + document.getElementById("ads-text").innerHTML = langs.ads_text; + + document.getElementById("settings-btn").querySelector(".settings-button-span").innerHTML = langs.tooltip_settings; + document.getElementById("btnShowNews").querySelector(".button-span").innerHTML = langs.tooltip_news; + document.getElementById("openBattlyFolderButton").querySelector(".button-span").innerHTML = langs.tooltip_folder; + document.getElementById("BotonUnirseServidorDiscord").querySelector(".button-span").innerHTML = langs.tooltip_discord; + document.getElementById("boton_abrir_mods").querySelector(".button-span").innerHTML = langs.tooltip_mods; + document.getElementById("music-btn").querySelector(".button-span").innerHTML = langs.tooltip_music; + document.getElementById("friends-btn").querySelector(".button-span").innerHTML = langs.tooltip_friends; + document.getElementById("instancias-btn").querySelector(".button-span").innerHTML = langs.tooptip_instances; + document.getElementById("download-btn").querySelector(".button-span").innerHTML = langs.tooptip_download; + document.getElementById("play-btn").querySelector(".play-button-span").innerHTML = langs.tooltip_play; + document.getElementById("accounts-btn").querySelector(".button-span").innerHTML = langs.tooltip_accounts; + document.getElementById("java-btn").querySelector(".button-span").innerHTML = langs.tooltip_java; + document.getElementById("ram-btn").querySelector(".button-span").innerHTML = langs.tooltip_ram; + document.getElementById("launcher-btn").querySelector(".button-span").innerHTML = langs.tooltip_launcher; + document.getElementById("theme-btn").querySelector(".button-span").innerHTML = langs.tooltip_theme; + document.getElementById("background-btn").querySelector(".button-span").innerHTML = langs.tooltip_background; + document.getElementById("save-btn").querySelector(".button-span").innerHTML = langs.tooltip_save; /* settings */ - document.getElementById("accounts-btn-text").innerHTML = `${langs.accounts_btn}`; - document.getElementById("java-btn-text").innerHTML = `${langs.java_btn}`; - document.getElementById("ram-btn-text").innerHTML = `${langs.ram_btn}`; - document.getElementById("launcher-btn-text").innerHTML = `${langs.launcher_btn}`; - document.getElementById("theme-btn-text").innerHTML = `${langs.theme_btn}`; - document.getElementById( - "background-btn-text" - ).innerHTML = `${langs.background_btn}`; - document.getElementById("save-btn-text").innerHTML = `${langs.save_btn}`; - document.getElementById( - "account-information" - ).innerHTML = `${langs.account_information}`; - document.getElementById("mc-id-text").innerHTML = `${langs.mc_id_text}`; - document.getElementById( - "mostrarskin-userinfo-btn" - ).innerHTML = `${langs.showskin_userinfo_btn}`; - document.getElementById( - "eliminarcuenta-userinfo-btn" - ).innerHTML = `${langs.deleteaccount_userinfo_btn}`; + document.getElementById("accounts-btn-text").innerHTML = langs.accounts_btn; + document.getElementById("java-btn-text").innerHTML = langs.java_btn; + document.getElementById("ram-btn-text").innerHTML = langs.ram_btn; + document.getElementById("launcher-btn-text").innerHTML = langs.launcher_btn; + document.getElementById("theme-btn-text").innerHTML = langs.theme_btn; + document.getElementById("background-btn-text").innerHTML = langs.background_btn; + document.getElementById("save-btn-text").innerHTML = langs.save_btn; + document.getElementById("account-information").innerHTML = langs.account_information; + document.getElementById("mc-id-text").innerHTML = langs.mc_id_text; + document.getElementById("mostrarskin-userinfo-btn").innerHTML = langs.showskin_userinfo_btn; + document.getElementById("eliminarcuenta-userinfo-btn").innerHTML = `${langs.deleteaccount_userinfo_btn}`; document.getElementById("establecer-skin").innerHTML = `${langs.set_skin}`; document.getElementById("cerrar-userinfo-btn").innerHTML = `${langs.close}`; document.getElementById("my-accounts").innerHTML = `${langs.my_accounts}`; @@ -2674,11 +2633,15 @@ class Home { document.getElementById("button_ver_mods").innerHTML = `${langs.mods_list_button}`; document.getElementById("login-with-microsoft").innerHTML = `${langs.login_microsoft_adv_title}`; + document.getElementById("login-with-google").innerHTML = `${langs.login_with_google}`; document.getElementById("select_a_type_background").innerHTML = `${langs.select_a_type_background}`; document.getElementById("static-background-text").innerHTML = `${langs.static_background_text}`; document.getElementById("animated-background-text").innerHTML = `${langs.animated_background_text}`; document.getElementById("minimize_music").innerHTML = `${langs.minimize_music}`; document.getElementById("keep_music_opened").innerHTML = `${langs.keep_music_opened}`; + document.getElementById("code-login-text").innerHTML = `${langs.code_login_text}`; + document.getElementById("code-btn").innerHTML = `${langs.send}`; + document.getElementById("cancel-code-btn").innerHTML = `${langs.cancel}`; } async initNews() { @@ -2756,7 +2719,6 @@ class Home { } async initLaunch() { - //crear el archivo launcher_profiles.json en la ruta de main del launcher let launcherProfiles; let accounts = await this.database.getAll("accounts"); let accountsSelected = await this.database.get("1234", "accounts-selected"); @@ -2878,17 +2840,19 @@ class Home { document.getElementById("listaDeVersiones").value; let versiones = data_versions.versions; - //comprobar si la versión es compatible con forge, fabric o quilt, obteniendo las versiones, ejemplo: - /* {"versions":[{"version":"1.20.1","name":"1.20.1"},{"version":"1.20.1-forge","name":"1.20.1 - Forge"},{"version":"1.20.1-fabric","name":"1.20.1 - Fabric"},{"version":"1.20.1-quilt","name":"1.20.1 - Quilt"} ]} */ let radioVanilla = document.getElementById("radioVanilla"); let radioForge = document.getElementById("radioForge"); let radioFabric = document.getElementById("radioFabric"); let radioQuilt = document.getElementById("radioQuilt"); + let radioNeoForge = document.getElementById("radioNeoForge"); + let radioLegacyFabric = document.getElementById("radioLegacyFabric"); let versions_vanilla = []; let versiones_compatible_forge = []; let versiones_compatible_fabric = []; let versiones_compatible_quilt = []; + let versiones_compatibles_neoforge = []; + let versiones_compatibles_legacyfabric = []; for (let i = 0; i < versiones.length; i++) { let version = versiones[i].version; @@ -2898,128 +2862,63 @@ class Home { versiones_compatible_fabric.push(versiones[i].realVersion); } else if (version.endsWith("-quilt")) { versiones_compatible_quilt.push(versiones[i].realVersion); + } else if (version.endsWith("-neoforge")) { + versiones_compatibles_neoforge.push(versiones[i].realVersion); + } else if (version.endsWith("-legacyfabric")) { + versiones_compatibles_legacyfabric.push(versiones[i].realVersion); } } + console.log(versiones_compatibles_legacyfabric) + for (let i = 0; i < data_versions_mojang.versions.length; i++) { let version = data_versions_mojang.versions[i].id; versions_vanilla.push(version); } - if ( - versiones_compatible_forge.includes(version_selected) && - versiones_compatible_fabric.includes(version_selected) && - versiones_compatible_quilt.includes(version_selected) - ) { - document.getElementById("tipo-de-versiones").style.display = ""; - radioVanilla.style.display = ""; - radioForge.style.display = ""; - radioFabric.style.display = ""; - radioQuilt.style.display = ""; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else if ( - versiones_compatible_forge.includes(version_selected) && - versiones_compatible_fabric.includes(version_selected) - ) { - document.getElementById("tipo-de-versiones").style.display = ""; - radioVanilla.style.display = ""; - radioForge.style.display = ""; - radioFabric.style.display = ""; - radioQuilt.style.display = "none"; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else if ( - versiones_compatible_forge.includes(version_selected) && - versiones_compatible_quilt.includes(version_selected) - ) { - document.getElementById("tipo-de-versiones").style.display = ""; - radioVanilla.style.display = ""; - radioForge.style.display = ""; - radioFabric.style.display = "none"; - radioQuilt.style.display = ""; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else if ( - versiones_compatible_fabric.includes(version_selected) && - versiones_compatible_quilt.includes(version_selected) - ) { - document.getElementById("tipo-de-versiones").style.display = ""; - radioVanilla.style.display = ""; - radioForge.style.display = "none"; - radioFabric.style.display = ""; - radioQuilt.style.display = ""; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else if (versiones_compatible_forge.includes(version_selected)) { - document.getElementById("tipo-de-versiones").style.display = ""; - radioVanilla.style.display = ""; - radioForge.style.display = ""; - radioFabric.style.display = "none"; - radioQuilt.style.display = "none"; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else if (versiones_compatible_fabric.includes(version_selected)) { - document.getElementById("tipo-de-versiones").style.display = ""; - radioVanilla.style.display = ""; - radioForge.style.display = "none"; - radioFabric.style.display = ""; - radioQuilt.style.display = "none"; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else if (versiones_compatible_quilt.includes(version_selected)) { - document.getElementById("tipo-de-versiones").style.display = ""; - radioVanilla.style.display = ""; - radioForge.style.display = "none"; - radioFabric.style.display = "none"; - radioQuilt.style.display = ""; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else if (versions_vanilla.includes(version_selected)) { - document.getElementById("tipo-de-versiones").style.display = ""; - radioVanilla.style.display = ""; - radioForge.style.display = "none"; - radioFabric.style.display = "none"; - radioQuilt.style.display = "none"; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else if (version_selected === "dx") { - document.getElementById("tipo-de-versiones").display = "none"; - radioVanilla.style.display = "none"; - radioForge.style.display = "none"; - radioFabric.style.display = "none"; - radioQuilt.style.display = "none"; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = "none"; - } else { - document.getElementById("tipo-de-versiones").display = "none"; - radioVanilla.style.display = "none"; - radioForge.style.display = "none"; - radioFabric.style.display = "none"; - radioQuilt.style.display = "none"; - let footermodaliniciarversion = document.getElementById( - "footermodaliniciarversion" - ); - footermodaliniciarversion.style.display = ""; + const versions = [ + { id: "radioVanilla", list: versions_vanilla }, + { id: "radioForge", list: versiones_compatible_forge }, + { id: "radioFabric", list: versiones_compatible_fabric }, + { id: "radioQuilt", list: versiones_compatible_quilt }, + { id: "radioNeoForge", list: versiones_compatibles_neoforge }, + { id: "radioLegacyFabric", list: versiones_compatibles_legacyfabric }, + ]; + + function updateVersionDisplay(versionSelected) { + const tipoDeVersiones = document.getElementById("tipo-de-versiones"); + const footermodaliniciarversion = document.getElementById("footermodaliniciarversion"); + + if (versionSelected === "dx") { + tipoDeVersiones.style.display = "none"; + versions.forEach(version => { + document.getElementById(version.id).style.display = "none"; + }); + footermodaliniciarversion.style.display = "none"; + return; + } + + let anyMatch = false; + versions.forEach(version => { + if (version.list.includes(versionSelected)) { + document.getElementById(version.id).style.display = ""; + anyMatch = true; + } else { + document.getElementById(version.id).style.display = "none"; + } + }); + + if (anyMatch) { + tipoDeVersiones.style.display = ""; + footermodaliniciarversion.style.display = "none"; + } else { + tipoDeVersiones.style.display = "none"; + footermodaliniciarversion.style.display = ""; + } } + + updateVersionDisplay(version_selected); + }); //radio con name loader @@ -3037,6 +2936,7 @@ class Home { .getElementById("startStartVersion") .addEventListener("click", async () => { let version = document.getElementById("listaDeVersiones").value; + console.log(version); let versionType; let progressBar1 = document.getElementById("progressBar1_"); let modalDiv1 = document.getElementById("modalStartVersion"); @@ -3052,6 +2952,8 @@ class Home { let isForgeCheckBox = false; let isFabricCheckBox = false; let isQuiltCheckBox = false; + let isNeoForgeCheckBox = false; + let isLegacyFabricCheckBox = false; let settings_btn = document.getElementById("settings-btn"); let select_versions = document.getElementById("select-version"); @@ -3086,37 +2988,64 @@ class Home { version += `-forge`; } else if (versionType === "quilt") { version += `-quilt`; - } else { + } else if (versionType === "neoforge") { + version += `-neoforge`; + } else if (versionType === "legacyfabric") { + version += `-legacyfabric`; } let version_real; - if (version.endsWith("-forge")) { + if (version.includes("-forge")) { version_real = version.replace("-forge", ""); - } else if (version.endsWith("-fabric")) { + } else if (version.includes("-fabric")) { version_real = version.replace("-fabric", ""); - } else if (version.endsWith("-quilt")) { + } else if (version.includes("-quilt")) { version_real = version.replace("-quilt", ""); - } else if (version.endsWith("-extra")) { + } else if (version.includes("-neoforge")) { + version_real = version.replace("-neoforge", ""); + } else if (version.includes("-legacyfabric")) { + version_real = version.replace("-legacyfabric", ""); + } else if (version.includes("-extra")) { version_real = version.replace("-extra", ""); } else { version_real = version; } - if (version.endsWith("-forge")) { + if (version.includes("-forge")) { version = version.replace("-forge", ""); isForgeCheckBox = true; isFabricCheckBox = false; isQuiltCheckBox = false; - } else if (version.endsWith("-fabric")) { + isNeoForgeCheckBox = false; + isLegacyFabricCheckBox = false; + } else if (version.includes("-fabric")) { version = version.replace("-fabric", ""); isFabricCheckBox = true; isForgeCheckBox = false; isQuiltCheckBox = false; - } else if (version.endsWith("-quilt")) { + isNeoForgeCheckBox = false; + isLegacyFabricCheckBox = false; + } else if (version.includes("-quilt")) { version = version.replace("-quilt", ""); isQuiltCheckBox = true; isForgeCheckBox = false; isFabricCheckBox = false; + isNeoForgeCheckBox = false; + isLegacyFabricCheckBox = false; + } else if (version.includes("-neoforge")) { + version = version.replace("-neoforge", ""); + isForgeCheckBox = false; + isFabricCheckBox = false; + isQuiltCheckBox = false; + isNeoForgeCheckBox = true; + isLegacyFabricCheckBox = false; + } else if (version.includes("-legacyfabric")) { + version = version.replace("-legacyfabric", ""); + isFabricCheckBox = false; + isForgeCheckBox = false; + isQuiltCheckBox = false; + isNeoForgeCheckBox = false; + isLegacyFabricCheckBox = true; } let type; @@ -3129,6 +3058,12 @@ class Home { } else if (isQuiltCheckBox == true) { type = "quilt"; mcModPack = "quilt"; + } else if (isNeoForgeCheckBox == true) { + type = "neoforge"; + mcModPack = "neoforge"; + } else if (isLegacyFabricCheckBox == true) { + type = "legacyfabric"; + mcModPack = "legacyfabric"; } //hacer un json.parse del archivo de versiones y obtener el dato "assets" @@ -3213,8 +3148,7 @@ class Home { let opts; - console.log("AAAAAAAAAAAAAAAAAA") - console.log(version) + console.log(`✅ Versión detectada: ${version}`) let javapath = localStorage.getItem("java-path"); if (version.endsWith("-extra")) { @@ -3237,7 +3171,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, //javaPath: "C:\\Users\\ilyas\\Desktop\\RND Projects\\Java\\bin\\java.exe", version: versionData, loader: { @@ -3282,8 +3216,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, - //javaPath: "C:\\Users\\ilyas\\Desktop\\RND Projects\\Java\\bin\\java.exe", + downloadFileMultiple: 50, version: versionData, loader: { type: type, @@ -3324,8 +3257,8 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, - javapath: javapath, + downloadFileMultiple: 50, + javaPath: javapath, version: versionData, loader: { type: type, @@ -3341,6 +3274,7 @@ class Home { verify: false, ignored: ["loader"], java: false, + javapath: javapath, memory: { min: `${ram.ramMin * 1024}M`, max: `${ram.ramMax * 1024}M`, @@ -3369,8 +3303,8 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, - javapath: javapath, + downloadFileMultiple: 50, + javaPath: javapath, version: versionData, loader: { type: type, @@ -3386,6 +3320,7 @@ class Home { verify: false, ignored: ["loader"], java: false, + javapath: javapath, memory: { min: `${ram.ramMin * 1024}M`, max: `${ram.ramMax * 1024}M`, @@ -3413,7 +3348,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: versionData, loader: { type: type, @@ -3457,7 +3392,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, javaPath: javapath, version: versionData, loader: { @@ -5317,7 +5252,7 @@ class Home { title: langs.are_you_sure, text: langs.delete_version_text, showCancelButton: true, - confirmButtonColor: "#00d1b2", + confirmButtonColor: "#3e8ed0", cancelButtonColor: "#ff3860", confirmButtonText: langs.yes_delete, cancelButtonText: langs.no_cancel, @@ -5804,7 +5739,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: { custom: folderName, number: realVersion, @@ -5834,7 +5769,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: { custom: folderName, number: realVersion, @@ -5861,7 +5796,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: { custom: folderName, number: realVersion, @@ -5893,7 +5828,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: { custom: folderName, number: realVersion, @@ -6668,7 +6603,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: { custom: fileName, number: realVersion, @@ -6698,7 +6633,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: { custom: fileName, number: realVersion, @@ -6725,7 +6660,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: { custom: fileName, number: realVersion, @@ -6757,7 +6692,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, version: { custom: fileName, number: realVersion, @@ -7285,7 +7220,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, //javaPath: "C:\\Users\\ilyas\\Desktop\\RND Projects\\Java\\bin\\java.exe", version: versionData, loader: { @@ -7334,7 +7269,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, //javaPath: "C:\\Users\\ilyas\\Desktop\\RND Projects\\Java\\bin\\java.exe", version: versionData, loader: { @@ -7375,7 +7310,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, //javaPath: "C:\\Users\\ilyas\\Desktop\\RND Projects\\Java\\bin\\java.exe", version: versionData, loader: { @@ -7420,7 +7355,7 @@ class Home { detached: false, screen: screen, }, - downloadFileMultiple: 20, + downloadFileMultiple: 50, //javaPath: "C:\\Users\\ilyas\\Desktop\\RND Projects\\Java\\bin\\java.exe", version: versionData, loader: { diff --git a/src/assets/js/panels/login.js b/src/assets/js/panels/login.js index 35fd9fa..44a45cf 100644 --- a/src/assets/js/panels/login.js +++ b/src/assets/js/panels/login.js @@ -7,7 +7,7 @@ import { database, changePanel, addAccount, accountSelect } from '../utils.js'; import { Alert } from '../utils/alert.js'; -const { ipcRenderer } = require('electron'); +const { ipcRenderer, shell } = require('electron'); import { Lang } from "../utils/lang.js"; const Swal = require("./assets/js/libs/sweetalert/sweetalert2.all.min.js"); @@ -168,6 +168,147 @@ class Login { let infoLogin = document.getElementById("info-login") let loginBtn = document.getElementById("login-btn") + + document.getElementById("google-button").addEventListener("click", () => { + new Alert().ShowAlert({ + title: lang.login_with_google, + message: lang.login_with_google_msg, + type: "info" + }) + + shell.openExternal("https://battlylauncher.com/api/battly/google/login") + + document.getElementById("code-login-panel").classList.add("is-active"); + + }); + + document.getElementById("cancel-code-btn").addEventListener("click", () => { + document.getElementById("code-login-panel").classList.remove("is-active"); + }); + + document.getElementById("code-btn").addEventListener("click", () => { + const code = document.getElementById("code-text").value; + + if (code == "") { + new Alert().ShowAlert({ + title: lang.auth_code, + message: lang.auth_code_not_set, + type: "error" + }) + } else { + + infoLoginPanel.classList.add("is-active"); + infoLogin.innerHTML = lang.checking_auth_code; + + + fetch("https://battlylauncher.com/api/battly/google/verify", { + method: "POST", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify({ + code: code + }) + }).then(response => response.json()).then(async data => { + if (data.status == "error") { + new Alert().ShowAlert({ + title: "Error", + message: data.message, + type: "error" + }) + + infoLogin.innerHTML = data.message; + + setTimeout(() => { + infoLoginPanel.classList.remove("is-active"); + }, 3000); + } else { + + infoLogin.innerHTML = lang.logging_in; + + let account = { + type: "battly", + access_token: "1234", + client_token: "1234", + uuid: data.user.uuid, + name: data.user.username, + password: data.user.password, + user_properties: '{}', + meta: { + type: "cracked", + offline: true + } + } + + infoLogin.innerHTML = lang.checking_if_you_are_premium; + + let premiums = []; + try { + premiums = await fetch("https://api.battlylauncher.com/api/usuarios/obtenerUsuariosPremium").then(response => response.json()).then(data => data).catch(err => { }); + } catch (error) { + premiums = []; + } + + await this.database.addAccount(account) + await this.database.update({ uuid: "1234", selected: account.uuid }, 'accounts-selected'); + + let isPremium; + if (!premiums) isPremium = false; + else isPremium = premiums.includes(account.name); + addAccount(account, isPremium); + + document.getElementById("code-login-panel").classList.remove("is-active"); + document.getElementById("code-text").value = ""; + + accountSelect(account.uuid) + + infoLoginPanel.classList.remove("is-active"); + + let news_shown = localStorage.getItem("news_shown_v1.8"); + if (!news_shown || news_shown == "false" || news_shown == null || news_shown == undefined) { + document.querySelector(".preload-content").style.display = "none"; + changePanel("news"); + } else { + document.querySelector(".preload-content").style.display = "none"; + changePanel("home") + } + + cancelMojangBtn.disabled = false; + cancelMojangBtn.click(); + mailInput.value = ""; + passwordInput.value = ""; + loginBtn.disabled = false; + mailInput.disabled = false; + passwordInput.disabled = false; + loginBtn.style.display = "block"; + infoLogin.innerHTML = " "; + + let welcome = document.getElementById('battly-news-div'); + let blockWelcome = document.createElement('div'); + blockWelcome.classList.add('news-block', 'opacity-1'); + blockWelcome.innerHTML = ` +

+
+
${lang.welcome_again_to_battly}, ${account.name}
+
+
+
+
+

${lang.we_hope_you_enjoy}

+
+
`; + welcome.prepend(blockWelcome); + } + }).catch(err => { + new Alert().ShowAlert({ + title: "Error", + message: "Ocurrió un error al iniciar sesión.", + type: "error" + }) + }) + } + }); + cancelMojangBtn.addEventListener("click", () => { if (this.database.getAccounts().length == 0) { new Alert().ShowAlert({ @@ -275,107 +416,89 @@ class Login { } - const axios = require("axios"); - - let data = await axios.post("https://battlylauncher.com/api/battly/launcher/login", { - Headers: { + fetch("https://battlylauncher.com/api/battly/launcher/login", { + method: "POST", + headers: { "Content-Type": "application/json" }, - body: { + body: JSON.stringify({ username: mailInput.value, password: passwordInput.value - } - }).catch(err => { - console.log(err) - cancelMojangBtn.disabled = false; - loginBtn.disabled = false; - mailInput.disabled = false; - passwordInput.disabled = false; - mailInput.value = ""; - passwordInput.value = ""; - infoLogin.innerHTML = lang.username_or_password_incorrect; - setTimeout(() => { - infoLoginPanel.classList.remove("is-active"); - }, 3000); - return - }) - - if(data.data.status == "error") { - infoLogin.innerHTML = data.data.error - cancelMojangBtn.disabled = false; - loginBtn.disabled = false; - mailInput.disabled = false; - passwordInput.disabled = false; - infoLogin.innerHTML = data.data.message; - setTimeout(() => { - infoLoginPanel.classList.remove("is-active"); - }, 3000); - return - } - - if (data.data.status == "success") { - + }) + }).then(response => response.json()).then(async data => { - + if (data.status == "error") { + infoLogin.innerHTML = data.error + cancelMojangBtn.disabled = false; + loginBtn.disabled = false; + mailInput.disabled = false; + passwordInput.disabled = false; + infoLogin.innerHTML = data.message; + setTimeout(() => { + infoLoginPanel.classList.remove("is-active"); + }, 3000); + return + } - account = { - type: "battly", - access_token: "1234", - client_token: "1234", - uuid: uuid_, - name: mailInput.value, - password: passwordInput.value, - user_properties: '{}', - meta: { - type: "cracked", - offline: true + if (data.status == "success") { + account = { + type: "battly", + access_token: "1234", + client_token: "1234", + uuid: uuid_, + name: mailInput.value, + password: passwordInput.value, + user_properties: '{}', + meta: { + type: "cracked", + offline: true + } } - } - infoLogin.innerHTML = lang.checking_premium; + infoLogin.innerHTML = lang.checking_premium; - let premiums = []; - try { - premiums = await fetch("https://api.battlylauncher.com/api/usuarios/obtenerUsuariosPremium").then(response => response.json()).then(data => data).catch(err => { }); - } catch (error) { - premiums = []; - } + let premiums = []; + try { + premiums = await fetch("https://api.battlylauncher.com/api/usuarios/obtenerUsuariosPremium").then(response => response.json()).then(data => data).catch(err => { }); + } catch (error) { + premiums = []; + } - await this.database.addAccount(account) - await this.database.update({ uuid: "1234", selected: account.uuid }, 'accounts-selected'); + await this.database.addAccount(account) + await this.database.update({ uuid: "1234", selected: account.uuid }, 'accounts-selected'); - let isPremium; - if (!premiums) isPremium = false; - else isPremium = premiums.includes(account.name); - addAccount(account, isPremium); + let isPremium; + if (!premiums) isPremium = false; + else isPremium = premiums.includes(account.name); + addAccount(account, isPremium); - infoLoginPanel.classList.remove("is-active"); + infoLoginPanel.classList.remove("is-active"); - await accountSelect(account.uuid) - let news_shown = localStorage.getItem("news_shown_v1.8"); - if (!news_shown || news_shown == "false" || news_shown == null || news_shown == undefined) { - document.querySelector(".preload-content").style.display = "none"; - changePanel("news"); - } else { - document.querySelector(".preload-content").style.display = "none"; - changePanel("home") - } + await accountSelect(account.uuid) + let news_shown = localStorage.getItem("news_shown_v1.8"); + if (!news_shown || news_shown == "false" || news_shown == null || news_shown == undefined) { + document.querySelector(".preload-content").style.display = "none"; + changePanel("news"); + } else { + document.querySelector(".preload-content").style.display = "none"; + changePanel("home") + } - cancelMojangBtn.disabled = false; - cancelMojangBtn.click(); - mailInput.value = ""; - passwordInput.value = ""; - loginBtn.disabled = false; - mailInput.disabled = false; - passwordInput.disabled = false; - loginBtn.style.display = "block"; - infoLogin.innerHTML = " "; + cancelMojangBtn.disabled = false; + cancelMojangBtn.click(); + mailInput.value = ""; + passwordInput.value = ""; + loginBtn.disabled = false; + mailInput.disabled = false; + passwordInput.disabled = false; + loginBtn.style.display = "block"; + infoLogin.innerHTML = " "; - let welcome = document.getElementById('battly-news-div'); - let blockWelcome = document.createElement('div'); - blockWelcome.classList.add('news-block', 'opacity-1'); - blockWelcome.innerHTML = ` + let welcome = document.getElementById('battly-news-div'); + let blockWelcome = document.createElement('div'); + blockWelcome.classList.add('news-block', 'opacity-1'); + blockWelcome.innerHTML = `
${lang.welcome_again_to_battly}, ${account.name}
@@ -386,8 +509,19 @@ class Login {

${lang.we_hope_you_enjoy}

`; - welcome.prepend(blockWelcome); - } + welcome.prepend(blockWelcome); + } + }).catch(err => { + console.log(err) + infoLogin.innerHTML = lang.error_logging_in; + setTimeout(() => { + infoLoginPanel.classList.remove("is-active"); + }, 3000); + cancelMojangBtn.disabled = false; + loginBtn.disabled = false; + mailInput.disabled = false; + passwordInput.disabled = false; + }); }) } } diff --git a/src/assets/js/panels/mods.js b/src/assets/js/panels/mods.js index 4026985..2bbbd51 100644 --- a/src/assets/js/panels/mods.js +++ b/src/assets/js/panels/mods.js @@ -803,15 +803,6 @@ class Mods { if (name && description && version && loader && loaderVersion) { - //crear un string random de 6 caracteres - - //crear el archivo de la instancia - //comprobar si existe la carpeta de instancias - - - - - //descargar la imagen https://bulma.io/images/placeholders/128x128.png y moverla a la carpeta de la instancia fetch("https://battlylauncher.com/assets/img/mc-icon.png") .then((res) => res.buffer()) .then((buffer) => { @@ -894,7 +885,6 @@ class Mods { } } } - } async function descargarMod(projectID, fileID, destino, manifestPath) { diff --git a/src/assets/js/panels/settings.js b/src/assets/js/panels/settings.js index 95df45d..79de7b0 100644 --- a/src/assets/js/panels/settings.js +++ b/src/assets/js/panels/settings.js @@ -786,7 +786,7 @@ class Settings { let ram = ramDatabase ? ramDatabase : { ramMin: "0.5", - ramMax: "1" + ramMax: "0.5" }; let slider = new Slider(".memory-slider", parseFloat(ram.ramMin), parseFloat(ram.ramMax)); diff --git a/src/assets/js/utils/alert.js b/src/assets/js/utils/alert.js index 700136d..ef45ef8 100644 --- a/src/assets/js/utils/alert.js +++ b/src/assets/js/utils/alert.js @@ -18,26 +18,21 @@ class Alert { return; } - isAnimating = true; + alertQueue.push(info); await this.showNextAlert(info); } async showNextAlert(info) { - if (alertQueue.length < 0) { + if (alertQueue.length <= 0) { isAnimating = false; return; + } else { + const info2 = alertQueue.shift(); + isAnimating = true; + await this.displayAlert(info2); + await this.showNextAlert(info2); + isAnimating = false; } - - if (alertQueue.length == 0) { - await this.displayAlert(info); - return; - } - - const info2 = alertQueue.shift(); - - await this.displayAlert(info2); - - await this.showNextAlert(info2); } async displayAlert(info) { @@ -126,5 +121,4 @@ class Alert { } -export { Alert -}; +export { Alert }; diff --git a/src/assets/js/utils/logger.js b/src/assets/js/utils/logger.js index f933d8a..b7f3ef9 100644 --- a/src/assets/js/utils/logger.js +++ b/src/assets/js/utils/logger.js @@ -51,6 +51,13 @@ class logger { if (typeof value === 'object') value = JSON.stringify(value); consoleOutput += `[ERROR] ${new Date().toISOString()} - ${value}\n`; }; + + console.adv = (value) => { + console_log.call(console, value[0], value[1]); + + if (typeof value === 'object') value = JSON.stringify(value); + consoleOutput += `[ADV] ${new Date().toISOString()} - ${value}\n`; + }; } } diff --git a/src/assets/js/windows/updateWindow.js b/src/assets/js/windows/updateWindow.js index 5784e20..6e16cac 100644 --- a/src/assets/js/windows/updateWindow.js +++ b/src/assets/js/windows/updateWindow.js @@ -45,7 +45,7 @@ async function createWindow() { updateWindow.loadFile(path.join(electron.app.getAppPath(), 'src', 'index.html')); updateWindow.once('ready-to-show', () => { if (updateWindow) { - updateWindow.openDevTools(); + //updateWindow.openDevTools(); } }); } diff --git a/src/assets/langs/ar.js b/src/assets/langs/ar.js index 3d97607..5043cec 100644 --- a/src/assets/langs/ar.js +++ b/src/assets/langs/ar.js @@ -1,5 +1,5 @@ const strings = { - "salutate": "مرحباً!", + "salutate": "هولا!", "checking_connection": "التحقق من الاتصال بالإنترنت", "no_connection": "غير قادر على الاتصال بالإنترنت.
الدخول في وضع عدم الاتصال بالإنترنت", "starting_battly": "بدء تشغيل باتلي", @@ -12,7 +12,7 @@ const strings = { "update_downloaded": "تحديث تم تنزيله", "update_cancelled": "تم إلغاء الترقية", "update_completed": "تم تنزيل التحديث. سيتم نقلك الآن إلى مُثبِّت Battly.", - "update_error": "خطأ عند التحقق من وجود تحديثات، خطأ:", + "update_error": "خطأ عند التحقق من وجود تحديثات، خطأ:
", "errkr_connecting_server": "خطأ في الاتصال بالخادم.
تحقق من اتصالك أو حاول مرة أخرى لاحقاً.", "closing_countdown": "الإغلاق", "starting_launcher": "بدء تشغيل باتلي", @@ -301,7 +301,7 @@ const strings = { "threecharacters_username": "يجب ألا يقل طول اسم المستخدم عن 3 أحرف.", "set_your_password": "أدخل كلمة المرور الخاصة بك", "threecharacters_password": "يجب ألا يقل طول كلمة المرور عن 3 أحرف", - "username_or_password_incorrect": "اسم المستخدم أو كلمة المرور غير صحيحين", + "username_or_password_incorrect": "اسم المستخدم أو كلمة المرور غير صحيحة", "welcome_again_to_battly": "مرحباً بعودتك إلى باتلي", "we_hope_you_enjoy": "نأمل أن تستمتع بتجربة اللعب!", "use_account_battly_or_microsoft": "استخدم حسابك على Battly أو Microsoft لتسجيل الدخول إلى Battly", @@ -319,6 +319,14 @@ const strings = { "login_microsoft_accept": "لقد اشتريت ماين كرافت", "login_microsoft_cancel": "لم أشتري ماين كرافت", "no_accounts_message": "إضافة حساب للعب اضغط ⚙️ > إضافة حساب", + "checking_if_you_are_premium": "التحقق مما إذا كنت متميزاً أم لا", + "auth_code": "رمز التوثيق", + "auth_code_not_set": "لم يتم إنشاء رمز التوثيق", + "login_with_google": "تسجيل الدخول باستخدام Google", + "login_with_google_msg": "سيتم فتح نافذة تسجيل الدخول إلى Google.", + "checking_auth_code": "التحقق من رمز المصادقة", + "code_login_text": "أدخل الرمز الذي ظهر لك في المتصفح", + "send": "إرسال", "january": "كانون الثاني/يناير", "february": "شباط/فبراير", "march": "مارس", @@ -382,11 +390,27 @@ const strings = { "error_found": "تم العثور على خطأ", "find_solution": "إيجاد حل", "searching_solution": "أبحث عن حل...", - "searching_solution_taking_1": "يستغرق الأمر وقتاً أطول من المعتاد، من فضلك، انتظر...", + "searching_solution_taking_1": "يستغرق الأمر وقتًا أطول من المعتاد، من فضلك، انتظر...", "searching_solution_taking_2": "ما زلنا نبحث عن...", "searching_solution_taking_3": "نواجه مشكلة في إيجاد حل، يرجى المحاولة مرة أخرى في وقت لاحق.", "no_solution_found": "لم يتم العثور على حل لهذه المشكلة. يمكنك محاولة البحث في جوجل عن الخطأ الذي حصلت عليه.", - "solution_found": "تم العثور على حل!" + "solution_found": "تم العثور على حل!", + "tooltip_settings": "اضبط إعدادات باتلي حسب رغبتك", + "tooltip_news": "اطلع على آخر التحديثات", + "tooltip_folder": "افتح مجلد باتلي", + "tooltip_discord": "انضم إلى خادم ديسكورد", + "tooltip_mods": "قم بتنزيل تعديلاتك المفضلة من Battly", + "tooltip_music": "استمع إلى موسيقاك المفضلة وقتما تشاء", + "tooltip_friends": "شاهد ما يلعبه أصدقاؤك لتنضم إليهم.", + "tooptip_instances": "افصل تعديلاتك وشغِّل حزم التعديل المفضلة لديك", + "tooptip_download": "تنزيل إصدارات ماين كرافت", + "tooltip_play": "تشغيل الإصدارات التي تم تنزيلها", + "tooltip_accounts": "إدارة حسابات باتلي الخاصة بك", + "tooltip_java": "تكوين جافا", + "tooltip_ram": "ضبط ذاكرة الوصول العشوائي لماين كرافت", + "tooltip_launcher": "يضبط سلوك باتلي", + "tooltip_theme": "تخصيص ألوان باتلي", + "tooltip_background": "اضبط خلفية باتلي حسب رغبتك", + "tooltip_save": "حفظ الإعدادات والعودة إلى القائمة" }; - export default strings; \ No newline at end of file diff --git a/src/assets/langs/de.js b/src/assets/langs/de.js index e7dc83e..bc832dd 100644 --- a/src/assets/langs/de.js +++ b/src/assets/langs/de.js @@ -1,5 +1,5 @@ const strings = { - "salutate": "Hallo!", + "salutate": "¡Hola!", "checking_connection": "Überprüfung der Internetverbindung", "no_connection": "Verbindung zum Internet kann nicht hergestellt werden.
Wechsel in den Offline-Modus", "starting_battly": "Battly starten", @@ -12,7 +12,7 @@ const strings = { "update_downloaded": "Heruntergeladene Aktualisierung", "update_cancelled": "Upgrade storniert", "update_completed": "Update heruntergeladen. Sie werden nun zum Battly-Installationsprogramm weitergeleitet.", - "update_error": "Fehler bei der Suche nach Updates, Fehler:", + "update_error": "Fehler bei der Suche nach Updates, Fehler :
", "errkr_connecting_server": "Fehler beim Verbinden mit dem Server.
Überprüfen Sie Ihre Verbindung oder versuchen Sie es später noch einmal.", "closing_countdown": "Hereinspaziert", "starting_launcher": "Battly starten", @@ -202,191 +202,215 @@ const strings = { "you_dont_have_friends_7": "Füllen Sie das Formular aus, klicken Sie auf Freunde hinzufügen und fügen Sie jemanden hinzu.", "you_dont_have_friends_8": "Wow, du hast ja gar keine Freunde... versuch doch mal, jemandem eine Anfrage zu schicken.", "error_detected_one": "Fehler erkannt: Minecraft wurde unerwartet geschlossen. Starten Sie Minecraft neu.", - "error_detected_two": "Fehler entdeckt: Unbekannter Fehler. Starten Sie Minecraft neu.", + "error_detected_two": "Error detectado: Error desconocido. Vuelve a iniciar Minecraft.", "error_detected_three": "Fehler erkannt: Nicht genug RAM zum Starten von Minecraft. Denken Sie daran, dass Sie es unter Einstellungen > RAM konfigurieren können.", - "error_detected_four": "Fehler erkannt: Forge kann nicht gepatcht werden. Starten Sie Minecraft neu.", + "error_detected_four": "Error detectado: No se ha podido parchear Forge. Vuelve a iniciar Minecraft.", "error_detected_five": "Fehler erkannt: Minecraft konnte nicht gestartet werden. Starten Sie Minecraft neu.", - "choose_fabric_version": "Wählen Sie eine Fabric-Version", + "choose_fabric_version": "Selecciona una versión de Fabric", "choose_forge_version": "Wählen Sie eine Version von Forge", - "choose_quilt_version": "Wählen Sie eine Version von Quilt", + "choose_quilt_version": "Selecciona una versión de Quilt", "choose_optifine_version": "Wählen Sie eine OptiFine-Version", "choose_neoforge_version": "Wählen Sie eine Version von NeoForge", - "choose_legacyfabric_version": "Wählen Sie eine Version von LegacyFabric", - "choose_a_client": "Wählen Sie einen Kunden", + "choose_legacyfabric_version": "Selecciona una versión de LegacyFabric", + "choose_a_client": "Selecciona un cliente", "starting_download_can_take": "Beginn der Installation... Das kann eine Weile dauern...", "log": "Registro", "start_minecraft_text": "Minecraft starten", - "select_the_version_that_you_want": "Wählen Sie die Version, die Sie öffnen möchten", + "select_the_version_that_you_want": "Selecciona la versión que quieres abrir", "select_a_version": "Wählen Sie eine Version", - "title_access_logs": "Zugang zu Ihren Protokollen", + "title_access_logs": "Acceso a tus logs", "text_access_logs": "Der Zugang zu Ihren Battly-Protokollen wurde angefordert, möchten Sie ihn gewähren?", - "requester": "Anwerbung", - "reason": "Grund", - "text_access_logs_two": "Wenn Sie den Zugang verweigern, ist es nicht möglich, die Protokolle zu erhalten, also stellen Sie sicher, dass der Antragsteller vertrauenswürdig ist.", - "allow": "Erlauben Sie", + "requester": "Solicitante", + "reason": "Razón", + "text_access_logs_two": "Si no permites el acceso, no se podrá obtener los logs.Asegúrate que el solicitante sea de confianza.", + "allow": "Permitir", "deny": "Denegar", - "access_logs_denied": "Der Zugang zu den Protokollen wurde verweigert.", - "access_logs_denied_text": "Wenn Sie glauben, dass Sie angegriffen werden, wenden Sie sich umgehend an das Support-Team von Battly.", - "your_unique_id_is": "Ihre eindeutige Battly-ID lautet:", - "dont_share_it": "Verwenden Sie diese ID, um bessere Hilfe für Ihr Problem zu erhalten.", - "id_copied_correctly": "Die ID ist korrekt kopiert worden.", - "copy": "Kopieren", + "access_logs_denied": "Se ha denegado el acceso a los logs.", + "access_logs_denied_text": "Si crees que estás siendo atacado, contacta con el equipo de soporte de Battly urgentemente.", + "your_unique_id_is": "Tu ID única de Battly es:", + "dont_share_it": "Usa esta ID para poder recibir mejor ayuda con tu problema.", + "id_copied_correctly": "Se ha copiado la ID correctamente.", + "copy": "Copiar", "return": "Volver", - "install_modpack": "Installieren von ModPack", + "install_modpack": "Instalar ModPack", "search_mods": "Buscar mods...", - "compatible_with_curseforge_or_modrinth": "Kompatibel mit CurseForge oder Modrinth ModPacks", - "install_modpack_text": "Installieren von ModPack", - "you_didnt_selected_any_file": "Sie haben keine Dateien ausgewählt", - "installing_modpack_can_take": "ModPack installieren... Das kann eine Weile dauern...", - "no_description": "Keine Beschreibung", - "installing_file": "Datei installieren", + "compatible_with_curseforge_or_modrinth": "Compatible con ModPacks de CurseForge o Modrinth", + "install_modpack_text": "Instalar ModPack", + "you_didnt_selected_any_file": "No has seleccionado ningún archivo", + "installing_modpack_can_take": "Instalando ModPack... Puede tardar...", + "no_description": "Sin descripción", + "installing_file": "Instalando archivo", "modpack_installed": "ModPack instalado", - "modpack_installed_correctly": "korrekt installiert", - "installing_mod": "Installieren eines Mods", - "the_file_is_not_compatible": "Die Datei ist nicht kompatibel", - "the_modpack_is_not_compatible": "Das ModPack ist nicht kompatibel", - "the_modpack_is_not_compatible_text": "Stellen Sie sicher, dass es von CurseForge oder Modrinth ist.", - "searching_mods": "Auf der Suche nach Mods", - "downloading_mod": "Herunterladen der Mod", - "mod_downloaded_successfully": "erfolgreich heruntergeladen", - "error_downloading_mod": "Fehler beim Herunterladen", - "error_downloading_dependency": "Fehler beim Herunterladen der Abhängigkeit", - "dependency": "Abhängigkeit", - "downloaded_successfully_two": "erfolgreich heruntergeladen", - "loading_mod_information": "Laden von Mod-Informationen", - "mod_information": "Mod-Informationen", - "mod_stats": "Mod-Statistiken", - "downloads": "Herunterladen", - "followers": "Follower", - "view_on_modrinth": "Würmer in Modrinth", - "download_mod": "Mod herunterladen", - "delete_mod": "Mod entfernen", - "mod_deleted_correctly": "Mod erfolgreich entfernt", - "all_this_information_copyright_modrinth": "Alle diese Informationen (Bilder, Namen, Downloads, Dateien) stammen von der offiziellen Modrinth API. Alle Rechte vorbehalten.", - "deleted_successfully": "korrekt gelöscht", - "the_installation_is_in_2nd_plan": "Die Installation befindet sich im Hintergrund", - "the_installation_is_in_2nd_plan_text": "Sie können Battly weiterhin durchsuchen, während das ModPack installiert wird.", - "the_installation_was_cancelled": "Die Installation wurde abgebrochen", - "the_installation_was_cancelled_text": "Sie haben die Installation des ModPacks abgebrochen.", - "checking_premium": "Prüfen, ob Sie Premium sind", - "account_selected": "Ausgewähltes Konto", - "account_selected_text": "Konto", - "account_selected_text_two": "richtig gewählt", - "install": "Installation von", - "logs_saved_correctly": "Korrekt gespeicherte Aufzeichnungen", - "welcome_battly_social": "👋 Willkommen bei der neuen Battly-Freundesliste. Hier kannst du alle deine Freunde sehen, sie hinzufügen, sehen, was sie spielen und ihre Statistiken.", - "friends_list_text": "Liste der Freunde", - "add_friend": "Freund hinzufügen", + "modpack_installed_correctly": "instalado correctamente", + "installing_mod": "Instalando mod", + "the_file_is_not_compatible": "El archivo no es compatible", + "the_modpack_is_not_compatible": "El ModPack no es compatible", + "the_modpack_is_not_compatible_text": "Asegúrate de que sea de CurseForge o Modrinth.", + "searching_mods": "Buscando mods", + "downloading_mod": "Descargando mod", + "mod_downloaded_successfully": "descargado correctamente", + "error_downloading_mod": "Error al descargar", + "error_downloading_dependency": "Error al descargar la dependencia", + "dependency": "Dependencia", + "downloaded_successfully_two": "descargada correctamente", + "loading_mod_information": "Cargando información del mod", + "mod_information": "Información del mod", + "mod_stats": "Estadísticas del mod", + "downloads": "Descargas", + "followers": "Seguidores", + "view_on_modrinth": "Ver en Modrinth", + "download_mod": "Descargar mod", + "delete_mod": "Eliminar mod", + "mod_deleted_correctly": "Mod eliminado correctamente", + "all_this_information_copyright_modrinth": "Toda esta información (imágenes, nombres, descargas, archivos) provienen de la API oficial de Modrinth. Todos los derechos reservados.", + "deleted_successfully": "eliminado correctamente", + "the_installation_is_in_2nd_plan": "La instalación está en segundo plano", + "the_installation_is_in_2nd_plan_text": "Puedes seguir navegando por Battly mientras se instala el ModPack.", + "the_installation_was_cancelled": "La instalación fue cancelada", + "the_installation_was_cancelled_text": "Has cancelado la instalación del ModPack.", + "checking_premium": "Comprobando si eres premium", + "account_selected": "Cuenta seleccionada", + "account_selected_text": "Cuenta", + "account_selected_text_two": "seleccionada correctamente", + "install": "Instalar", + "logs_saved_correctly": "Registros guardados correctamente", + "welcome_battly_social": "👋 Bienvenido/a al nuevo panel de amigos de Battly. Aquí podrás ver a todos tus amigos, añadirlos, ver qué están jugando y sus estadísticas", + "friends_list_text": "Lista de amigos", + "add_friend": "Añadir amigo", "show_requests": "Ver solicitudes", - "accept": "Akzeptieren", - "starting_version_can_take": "Startversion... Es kann eine Weile dauern...", - "you_dont_have_any_friend_requests": "Sie haben keine Freundschaftsanfragen", - "friend_requests": "Freundschaftsanfragen", - "request_accepted": "Bewerbung angenommen", - "request_rejected": "Antrag abgelehnt", - "search": "Suche", - "loading_friends": "Freunde aufladen", - "error_loading_friends": "Fehler beim Abrufen der Freundesliste. Überprüfen Sie Ihre Internetverbindung und versuchen Sie es später erneut.", - "in_the_main_menu": "Im Startmenü", - "add_friend_text": "Freund hinzufügen", - "username": "Name des Benutzers", - "you_cannot_add_yourself": "Sie können sich selbst nicht als Freund hinzufügen.", - "you_already_have_this_friend": "Sie haben diesen Benutzer bereits als Freund.", - "request_sent_to": "Bewerbung gesendet an", - "correctly": "richtig", - "a_microsoft_panel_opened": "Ein Microsoft-Anmeldefenster hat sich geöffnet.", - "logging_in": "Einloggen", - "error_logging_in": "Fehler beim Einloggen", - "set_your_username": "Geben Sie Ihren Benutzernamen ein", - "threecharacters_username": "Ihr Benutzername muss mindestens 3 Zeichen lang sein.", - "set_your_password": "Geben Sie Ihr Passwort ein", - "threecharacters_password": "Ihr Passwort muss mindestens 3 Zeichen lang sein", - "username_or_password_incorrect": "Benutzername oder Passwort sind falsch", - "welcome_again_to_battly": "Willkommen zurück bei Battly", - "we_hope_you_enjoy": "Wir wünschen Ihnen viel Spaß beim Spielen!", - "use_account_battly_or_microsoft": "Verwenden Sie Ihr Battly- oder Microsoft-Konto, um sich bei Battly anzumelden", - "password": "Passwort", - "login_text_panel_login": "Anmeldung", - "register_open_btn": "Register", - "lost_your_account": "Haben Sie Ihr Passwort vergessen?", - "recover_it_here": "Rufen Sie es hier ab", - "login": "Einloggen", - "you_dont_have_account": "Sie haben noch kein Konto?", - "account_already_exists": "Sie sind bereits mit diesem Konto eingeloggt", - "password_not_set": "Sie sind von Ihrem Konto abgemeldet worden. Sie müssen sich erneut anmelden, um fortzufahren.", - "login_microsoft_adv_title": "Anmeldung mit Microsoft", - "login_microsoft_adv_text": "Wir haben viele Beschwerden über Probleme mit der Microsoft-Anmeldung erhalten... Aber... Das sind alles Leute, die Minecraft nicht gekauft haben... Wenn du Minecraft gekauft hast, kannst du dich ohne Probleme mit Microsoft anmelden. Wenn nicht, melden Sie sich mit einem Battly-Konto an.", - "login_microsoft_accept": "Ich habe Minecraft gekauft", - "login_microsoft_cancel": "Ich habe Minecraft nicht gekauft", - "no_accounts_message": "Fügen Sie zum Spielen ein Konto hinzu. Drücken Sie ⚙️ > Konto hinzufügen", - "january": "Januar", - "february": "Februar", - "march": "März", - "april": "April", + "accept": "Aceptar", + "starting_version_can_take": "Iniciando versión... Puede tardar un poco...", + "you_dont_have_any_friend_requests": "No tienes solicitudes de amistad", + "friend_requests": "Solicitudes de amistad", + "request_accepted": "Solicitud aceptada", + "request_rejected": "Solicitud rechazada", + "search": "Buscar", + "loading_friends": "Cargando amigos", + "error_loading_friends": "Error al obtener la lista de amigos. Comprueba tu conexión a internet y vuelve a intentarlo más tarde.", + "in_the_main_menu": "En el menú de inicio", + "add_friend_text": "Añadir amigo", + "username": "Nombre de usuario", + "you_cannot_add_yourself": "No puedes añadirte a ti mismo como amigo.", + "you_already_have_this_friend": "Ya tienes a este usuario como amigo.", + "request_sent_to": "Solicitud enviada a", + "correctly": "correctamente", + "a_microsoft_panel_opened": "Se ha abierto una ventana de inicio de sesión de Microsoft", + "logging_in": "Iniciando sesión", + "error_logging_in": "Error al iniciar sesión", + "set_your_username": "Ingresa tu nombre de usuario", + "threecharacters_username": "Tu nombre de usuario debe tener al menos 3 carácteres", + "set_your_password": "Ingresa tu contraseña", + "threecharacters_password": "Tu contraseña debe tener al menos 3 carácteres", + "username_or_password_incorrect": "El nombre de usuario o la contraseña son incorrectos", + "welcome_again_to_battly": "Bienvenid@ de nuevo a Battly", + "we_hope_you_enjoy": "¡Esperamos que disfrutes de la experiencia de juego!", + "use_account_battly_or_microsoft": "Usa tu cuenta de Battly o Microsoft para iniciar sesión en Battly", + "password": "Contraseña", + "login_text_panel_login": "Iniciar Sesión", + "register_open_btn": "Regístrate", + "lost_your_account": "¿Olvidaste tu contraseña?", + "recover_it_here": "Recupérala aquí", + "login": "Iniciar sesión", + "you_dont_have_account": "¿No tienes cuenta?", + "account_already_exists": "Ya has iniciado sesión con esta cuenta", + "password_not_set": "Se ha cerrado sesión de tu cuenta. Debes iniciar sesión de nuevo para continuar.", + "login_microsoft_adv_title": "Iniciar sesión con Microsoft", + "login_microsoft_adv_text": "Hemos recibido muchas quejas por problemas con el inicio de sesión de Microsoft... Pero... Todos es gente que no tiene Minecraft comprado... Si tienes Minecraft comprado, puedes iniciar sesión con Microsoft sin problemas. Si no, inicia sesión con una cuenta de Battly.", + "login_microsoft_accept": "Tengo Minecraft comprado", + "login_microsoft_cancel": "No tengo Minecraft comprado", + "no_accounts_message": "Añade una cuenta para jugar. Presiona ⚙️ > Añadir cuenta", + "checking_if_you_are_premium": "Comprobando si eres premium", + "auth_code": "Código de autenticación", + "auth_code_not_set": "No se ha establecido el código de autenticación", + "login_with_google": "Iniciar sesión con Google", + "login_with_google_msg": "Se abrirá una ventana de Google para iniciar sesión.", + "checking_auth_code": "Comprobando código de autenticación", + "code_login_text": "Pon el código que se te ha mostrado en el navegador", + "send": "Enviar", + "january": "Enero", + "february": "Febrero", + "march": "Marzo", + "april": "Abril", "may": "Mayo", "june": "Junio", - "july": "Juli", - "august": "August", - "september": "September", - "october": "Oktober", - "november": "November", - "december": "Dezember", - "you_dont_have_songs_in_your_playlist": "Sie haben keine Lieder in Ihrer Wiedergabeliste", + "july": "Julio", + "august": "Agosto", + "september": "Septiembre", + "october": "Octubre", + "november": "Noviembre", + "december": "Diciembre", + "you_dont_have_songs_in_your_playlist": "No tienes canciones en tu lista de reproducción", "save_playlist": "Guardar", - "saved_playlists": "Wiedergabelisten guardadas", - "playlist_name": "Titel der Wiedergabeliste", + "saved_playlists": "Playlists guardadas", + "playlist_name": "Título de la playlist", "save": "Guardar", - "you_need_to_set_a_playlist_name": "Sie müssen einen Namen für die Wiedergabeliste eingeben", - "already_have_a_playlist_with_this_name": "Sie haben bereits eine Wiedergabeliste mit diesem Namen", - "playlist_saved_correctly": "Wiedergabeliste korrekt gespeichert", - "welcome_to_the_new_playlists_system": "Willkommen im neuen Battly-Wiedergabelisten-Panel. Hier können Sie Ihre Wiedergabelisten verwalten, die Sie in Battly Music gespeichert haben.", - "getting_songs": "Lieder bekommen", - "getting": "Bezug von", - "loading": "Aufladen", - "thumbnail": "Miniaturausgabe", - "delete": "Löschen", - "songs_loaded_playing": "Geladene Musik!

Spielend", - "playlist_deleted_successfully": "Wiedergabeliste korrekt gelöscht", - "add": "hinzufügen", - "added": "Hinzugefügt", - "finded": "Gefunden", - "not_founded": "Nicht gefunden", - "playing_now": "Jetzt spielen", - "your_playlist": "Tu-Wiedergabeliste", - "no_song": "Kein Lied", - "add_songs_to_your_playlist": "Fügen Sie eine hinzu, indem Sie in der unten stehenden Suchmaschine danach suchen.", - "song_name": "Name des Liedes", - "playlists": "Wiedergabelisten", - "search_song": "Suche", - "save_playlist_text": "Guardar Wiedergabeliste", - "playlist_deleted_correctly": "Wiedergabeliste korrekt gelöscht", + "you_need_to_set_a_playlist_name": "Debes ingresar un nombre para la playlist", + "already_have_a_playlist_with_this_name": "Ya tienes una playlist con este nombre", + "playlist_saved_correctly": "Playlist guardada correctamente", + "welcome_to_the_new_playlists_system": "Bienvenid@ al nuevo panel de playlists de Battly, aquí podrás gestionar tus playlists que habrás guardado en Battly Music.", + "getting_songs": "Obteniendo canciones", + "getting": "Obteniendo", + "loading": "Cargando", + "thumbnail": "Miniatura", + "delete": "Eliminar", + "songs_loaded_playing": "¡Música cargada!
Reproduciendo", + "playlist_deleted_successfully": "Playlist eliminada correctamente", + "add": "Añadir", + "added": "Añadido", + "finded": "Encontrados", + "not_founded": "No encontrados", + "playing_now": "Reproduciendo ahora", + "your_playlist": "Tu playlist", + "no_song": "Ninguna canción", + "add_songs_to_your_playlist": "Añade una buscándola en el buscador de aquí abajo", + "song_name": "Nombre de la canción", + "playlists": "Playlists", + "search_song": "Buscar", + "save_playlist_text": "Guardar playlist", + "playlist_deleted_correctly": "Playlist eliminada correctamente", "volume": "Volumen", "mods_list_button": "Mis Mods", "mods": "Mods", - "welcome_mods": "👋 Willkommen im neuen Battly Mod-Panel. Hier kannst du deine heruntergeladenen Mods auf Battly verwalten.", - "premium_screen_1": "Wenn Sie dies lesen, sind Sie ein Battly Plus (Premium) Nutzer (oder Sie haben Tricks verwendet, um diese Nachricht zu sehen). Sie können jetzt alle Ihre Vorteile auf Battly genießen, wie zum Beispiel:", - "premium_screen_2": "Battly animierter Hintergrund", - "premium_screen_3": "Genau, normalerweise könnte man ein Hintergrundbild einfügen, aber als Premium können Sie einen animierten Hintergrund (ein sich wiederholendes Video) einfügen.", + "welcome_mods": "👋 Bienvenido/a al nuevo panel de mods de Battly. Aquí podrás gestionar tus mods descargados en Battly.", + "premium_screen_1": "Si estás leyendo esto es porque eres usuario Plus (premium) de Battly (o habrás usado truquitos para ver este mensaje). Ahora podrás disfrutar de todas tus ventajas en Battly como:", + "premium_screen_2": "Fondo animado en Battly", + "premium_screen_3": "Exactamente, normalmente podías añadir una imagen de fondo, pero al ser premium podrás añadir un fondo animado (un vídeo que se repite).", "premium_screen_4": "Skins HD + Capas Custom", - "premium_screen_5": "Normalerweise konntest du als normaler Benutzer nur deinen Skin hochladen und aus den 4 von Battly bereitgestellten Layern wählen, aber jetzt kannst du einen HD-Skin und deinen eigenen Layer hinzufügen.", - "premium_screen_6": "Einzigartiges Abzeichen in Battly", - "premium_screen_7": "Wenn du das hier fertig gelesen hast, sieh dir dein Profil an, du wirst ein haben, das bedeutet, dass du Premium bist.", - "premium_screen_8": "Rolle auf dem Discord-Server", - "premium_screen_9": "Wenn Sie Premium sind, haben Sie eine besondere Rolle auf dem Battly-Discord-Server.", - "premium_screen_10": "Priotäre Unterstützung", - "premium_screen_11": "Als Premium-Mitglied erhalten Sie vorrangige Unterstützung bei der Lösung Ihrer Battly-Probleme durch unsere besten Mitarbeiter.", - "premium_screen_12": "Battly wird ständig aktualisiert, so dass wir im Laufe der Zeit weitere Vorteile für Sie hinzufügen werden - danke, dass Sie Teil von Battly sind!", - "notification_crash_report_title": "Fehler beim Öffnen von Minecraft", - "notification_crash_report_text": "Überprüfen Sie den Fehler durch Öffnen von Battly", - "thats_a_error_message": "Dies ist eine Fehlermeldung beim Starten von Minecraft. Dies ist nicht die Schuld von Battly, melden Sie dieses Problem nicht.", - "error_found": "Fehler gefunden", - "find_solution": "Eine Lösung finden", - "searching_solution": "Auf der Suche nach einer Lösung...", - "searching_solution_taking_1": "Es dauert länger als sonst, bitte warten Sie...", - "searching_solution_taking_2": "Wir suchen noch nach...", - "searching_solution_taking_3": "Wir haben Probleme, eine Lösung zu finden. Bitte versuchen Sie es später noch einmal.", - "no_solution_found": "Es wurde noch keine Lösung für dieses Problem gefunden. Sie können versuchen, den Fehler zu googeln, den Sie erhalten haben.", - "solution_found": "Es wurde eine Lösung gefunden!" + "premium_screen_5": "Normalmente, siendo usuario normal, sólo podías subir tu skin y elegir entre las 4 capas que te da Battly, pero ahora podrás añadir una skin HD y tu propia capa.", + "premium_screen_6": "Insignia única en Battly", + "premium_screen_7": "Cuando acabes de leer esto, mira tu perfil, habrá aparecido un , eso significa que eres premium.", + "premium_screen_8": "Rol en el servidor de Discord", + "premium_screen_9": "Si eres premium, tendrás un rol especial en el servidor de Discord de Battly.", + "premium_screen_10": "Soporte priotirario", + "premium_screen_11": "Al ser premium, tendrás soporte prioritario para solucionar tus problemas de Battly con nuestros mejores staffs.", + "premium_screen_12": "Battly, siempre se está actualizando, por lo cual, con el tiempo, iremos añadiendo más ventajas para vosotros. ¡Gracias por formar parte de Battly!", + "notification_crash_report_title": "Error al abrir Minecraft", + "notification_crash_report_text": "Consulta el error abriendo Battly", + "thats_a_error_message": "Esto es un mensaje de error al iniciar Minecraft. Esto no es por culpa de Battly, no reportar este problema.", + "error_found": "Error encontrado", + "find_solution": "Encontrar solución", + "searching_solution": "Buscando solución...", + "searching_solution_taking_1": "Está tardando más de lo normal, por favor, espera...", + "searching_solution_taking_2": "Seguimos buscando...", + "searching_solution_taking_3": "Estamos teniendo problemas para encontrar una solución, por favor, intenta más tarde.", + "no_solution_found": "No se ha encontrado una solución a este problema. Puedes intentar buscar en Google el error que te ha dado.", + "solution_found": "¡Se ha encontrado una solución!", + "tooltip_settings": "Ajusta las configuraciones de Battly a tu gusto", + "tooltip_news": "Mira las últimas actualizaciones", + "tooltip_folder": "Abre la carpeta de Battly", + "tooltip_discord": "Únete al servidor de Discord", + "tooltip_mods": "Descarga tus modsfavoritos desde Battly", + "tooltip_music": "Escucha tu música favorita cuando quieras", + "tooltip_friends": "Mira que están jugando tus amigos para unirte a ellos", + "tooptip_instances": "Separa tus mods y juega tus modpacks favoritos", + "tooptip_download": "Descarga versiones de Minecraft", + "tooltip_play": "Juega las versiones descargadas", + "tooltip_accounts": "Gestiona tus cuentas de Battly", + "tooltip_java": "Configura Java", + "tooltip_ram": "Ajusta la RAM de Minecraft", + "tooltip_launcher": "Ajusta el comportamiento de Battly", + "tooltip_theme": "Personaliza los colores de Battly", + "tooltip_background": "Ajusta el fondo de Battly a tu gusto", + "tooltip_save": "Guarda las configuraciones y vuelve al menú" }; - export default strings; \ No newline at end of file diff --git a/src/assets/langs/en.js b/src/assets/langs/en.js index e0f8974..75f1351 100644 --- a/src/assets/langs/en.js +++ b/src/assets/langs/en.js @@ -1,5 +1,5 @@ const strings = { - "salutate": "Hi!", + "salutate": "¡Hola!", "checking_connection": "Checking internet connection", "no_connection": "Unable to connect to the Internet.
Entering offline mode", "starting_battly": "Starting Battly", @@ -12,7 +12,7 @@ const strings = { "update_downloaded": "Downloaded update", "update_cancelled": "Upgrade cancelled", "update_completed": "Update downloaded. Now the Battly installer will open.", - "update_error": "Error when checking for updates, error:", + "update_error": "Error when checking for updates, error :
", "errkr_connecting_server": "Error connecting to server.
Check your connection or try again later.", "closing_countdown": "Closing in", "starting_launcher": "Starting Battly", @@ -319,6 +319,14 @@ const strings = { "login_microsoft_accept": "I have purchased Minecraft", "login_microsoft_cancel": "I have not purchased Minecraft", "no_accounts_message": "Add an account to play. Click ⚙️ > Add account", + "checking_if_you_are_premium": "Checking if you are premium", + "auth_code": "Authentication code", + "auth_code_not_set": "Authentication code has not been established", + "login_with_google": "Sign in with Google", + "login_with_google_msg": "A Google login window will open.", + "checking_auth_code": "Checking authentication code", + "code_login_text": "Enter the code you have been shown in your browser", + "send": "Send to", "january": "January", "february": "February", "march": "March", @@ -386,7 +394,23 @@ const strings = { "searching_solution_taking_2": "We are still looking for...", "searching_solution_taking_3": "We are having trouble finding a solution, please try again later.", "no_solution_found": "No solution to this problem has been found. You can try googling the error you got.", - "solution_found": "A solution has been found!" + "solution_found": "A solution has been found!", + "tooltip_settings": "Adjust Battly's settings to your liking", + "tooltip_news": "See the latest updates", + "tooltip_folder": "Open the Battly folder", + "tooltip_discord": "Join the Discord server", + "tooltip_mods": "Download your favorite mods from Battly", + "tooltip_music": "Listen to your favorite music whenever you want", + "tooltip_friends": "See what your friends are playing to join them.", + "tooptip_instances": "Separate your mods and play your favorite modpacks", + "tooptip_download": "Download Minecraft versions", + "tooltip_play": "Play the downloaded versions", + "tooltip_accounts": "Manage your Battly accounts", + "tooltip_java": "Configure Java", + "tooltip_ram": "Adjust Minecraft RAM", + "tooltip_launcher": "Adjusts Battly's behavior", + "tooltip_theme": "Customize Battly's colors", + "tooltip_background": "Adjust Battly's background to your liking", + "tooltip_save": "Save the settings and return to the menu" }; - export default strings; \ No newline at end of file diff --git a/src/assets/langs/es.js b/src/assets/langs/es.js index e1c1753..647c086 100644 --- a/src/assets/langs/es.js +++ b/src/assets/langs/es.js @@ -384,6 +384,16 @@ const strings = { "login_microsoft_cancel": "No tengo Minecraft comprado", "no_accounts": "No tienes cuentas para jugar", "no_accounts_message": "Añade una cuenta para jugar. Presiona ⚙️ > Añadir cuenta", + "logging_in": "Iniciando sesión", + "checking_if_you_are_premium": "Comprobando si eres premium", + "auth_code": "Código de autenticación", + "auth_code_not_set": "No se ha establecido el código de autenticación", + "login_with_google": "Iniciar sesión con Google", + "login_with_google_msg": "Se abrirá una ventana de Google para iniciar sesión.", + "checking_auth_code": "Comprobando código de autenticación", + "login_with_google": "Iniciar sesión con Google", + "code_login_text": "Pon el código que se te ha mostrado en el navegador", + "send": "Enviar", /* months */ "january": "Enero", @@ -465,6 +475,28 @@ const strings = { "no_solution_found": "No se ha encontrado una solución a este problema. Puedes intentar buscar en Google el error que te ha dado.", "solution_found": "¡Se ha encontrado una solución!", + + /* tooltips */ + "tooltip_settings": "Ajusta las configuraciones de Battly a tu gusto", + "tooltip_news": "Mira las últimas actualizaciones", + "tooltip_folder": "Abre la carpeta de Battly", + "tooltip_discord": "Únete al servidor de Discord", + "tooltip_mods": "Descarga tus modsfavoritos desde Battly", + "tooltip_music": "Escucha tu música favorita cuando quieras", + "tooltip_friends": "Mira que están jugando tus amigos para unirte a ellos", + "tooptip_instances": "Separa tus mods y juega tus modpacks favoritos", + "tooptip_download": "Descarga versiones de Minecraft", + "tooltip_play": "Juega las versiones descargadas", + + /* tooltips settings */ + "tooltip_accounts": "Gestiona tus cuentas de Battly", + "tooltip_java": "Configura Java", + "tooltip_ram": "Ajusta la RAM de Minecraft", + "tooltip_launcher": "Ajusta el comportamiento de Battly", + "tooltip_theme": "Personaliza los colores de Battly", + "tooltip_background": "Ajusta el fondo de Battly a tu gusto", + "tooltip_save": "Guarda las configuraciones y vuelve al menú", + }; export default strings; \ No newline at end of file diff --git a/src/assets/langs/fr.js b/src/assets/langs/fr.js index e4ada66..3cd9000 100644 --- a/src/assets/langs/fr.js +++ b/src/assets/langs/fr.js @@ -1,5 +1,5 @@ const strings = { - "salutate": "Salut!", + "salutate": "¡Hola !", "checking_connection": "Vérification de la connexion internet", "no_connection": "Impossible de se connecter à l'internet.
Entrée en mode hors ligne", "starting_battly": "Démarrage de la batteuse", @@ -12,7 +12,7 @@ const strings = { "update_downloaded": "Mise à jour téléchargée", "update_cancelled": "Mise à niveau annulée", "update_completed": "Mise à jour téléchargée. Vous serez maintenant dirigé vers le programme d'installation de Battly.", - "update_error": "Erreur lors de la vérification des mises à jour, erreur :", + "update_error": "Erreur lors de la vérification des mises à jour, erreur :
.", "errkr_connecting_server": "Erreur de connexion au serveur.
Vérifiez votre connexion ou réessayez plus tard.", "closing_countdown": "Fermeture", "starting_launcher": "Démarrage de la batteuse", @@ -319,6 +319,14 @@ const strings = { "login_microsoft_accept": "J'ai acheté Minecraft", "login_microsoft_cancel": "Je n'ai pas acheté Minecraft", "no_accounts_message": "Ajoutez un compte pour jouer. Appuyez sur ⚙️ > Ajouter un compte", + "checking_if_you_are_premium": "Vérifier si vous êtes titulaire d'une prime", + "auth_code": "Code d'authentification", + "auth_code_not_set": "Code d'authentification non établi", + "login_with_google": "Se connecter avec Google", + "login_with_google_msg": "Une fenêtre de connexion à Google s'ouvre.", + "checking_auth_code": "Vérification du code d'authentification", + "code_login_text": "Saisissez le code qui vous a été présenté dans le navigateur", + "send": "Envoyer", "january": "Janvier", "february": "Février", "march": "Mars", @@ -386,7 +394,23 @@ const strings = { "searching_solution_taking_2": "Nous sommes toujours à la recherche de...", "searching_solution_taking_3": "Nous ne parvenons pas à trouver une solution, veuillez réessayer plus tard.", "no_solution_found": "Aucune solution à ce problème n'a été trouvée. Vous pouvez essayer de chercher l'erreur que vous avez obtenue sur Google.", - "solution_found": "Une solution a été trouvée !" + "solution_found": "Une solution a été trouvée !", + "tooltip_settings": "Ajustez les paramètres de Battly à votre convenance", + "tooltip_news": "Voir les dernières mises à jour", + "tooltip_folder": "Ouvrir le dossier Battly", + "tooltip_discord": "Rejoindre le serveur Discord", + "tooltip_mods": "Téléchargez vos mods préférés sur Battly", + "tooltip_music": "Écoutez votre musique préférée quand vous le souhaitez", + "tooltip_friends": "Voyez à quoi jouent vos amis et rejoignez-les.", + "tooptip_instances": "Séparez vos mods et jouez vos modpacks préférés", + "tooptip_download": "Télécharger les versions de Minecraft", + "tooltip_play": "Jouer les versions téléchargées", + "tooltip_accounts": "Gérer vos comptes Battly", + "tooltip_java": "Configurer Java", + "tooltip_ram": "Ajuster la RAM de Minecraft", + "tooltip_launcher": "Ajuste le comportement de Battly", + "tooltip_theme": "Personnaliser les couleurs de Battly", + "tooltip_background": "Ajustez l'arrière-plan de Battly à votre convenance", + "tooltip_save": "Sauvegarder les réglages et revenir au menu" }; - export default strings; \ No newline at end of file diff --git a/src/assets/langs/it.js b/src/assets/langs/it.js index 5fda661..188c54b 100644 --- a/src/assets/langs/it.js +++ b/src/assets/langs/it.js @@ -1,5 +1,5 @@ const strings = { - "salutate": "Hola!", + "salutate": "¡Hola!", "checking_connection": "Verifica della connessione a Internet", "no_connection": "Impossibile connettersi a Internet.
Entrare in modalità offline", "starting_battly": "Avvio di Battly", @@ -12,7 +12,7 @@ const strings = { "update_downloaded": "Aggiornamento scaricato", "update_cancelled": "Aggiornamento annullato", "update_completed": "Aggiornamento scaricato. A questo punto si accede al programma di installazione di Battly.", - "update_error": "Errore durante la verifica degli aggiornamenti, errore:", + "update_error": "Errore durante la verifica degli aggiornamenti, errore :
", "errkr_connecting_server": "Errore di connessione al server.
Controllare la connessione o riprovare più tardi.", "closing_countdown": "Chiusura", "starting_launcher": "Avvio di Battly", @@ -255,8 +255,8 @@ const strings = { "downloaded_successfully_two": "scaricato con successo", "loading_mod_information": "Caricamento delle informazioni sulla mod", "mod_information": "Informazioni sul mod", - "mod_stats": "Statistiche mod", - "downloads": "Download", + "mod_stats": "Statistiche del mod", + "downloads": "Scaricamento", "followers": "Seguaci", "view_on_modrinth": "Vermi in Modrinth", "download_mod": "Scarica il mod.", @@ -319,6 +319,14 @@ const strings = { "login_microsoft_accept": "Ho comprato Minecraft", "login_microsoft_cancel": "Non ho acquistato Minecraft", "no_accounts_message": "Aggiungere un account per giocare. Premere ⚙️ > Aggiungi account", + "checking_if_you_are_premium": "Controllare se si è in possesso di un premio", + "auth_code": "Codice di autenticazione", + "auth_code_not_set": "Codice di autenticazione non stabilito", + "login_with_google": "Accedi con Google", + "login_with_google_msg": "Si aprirà una finestra di accesso a Google.", + "checking_auth_code": "Verifica del codice di autenticazione", + "code_login_text": "Inserite il codice che vi è stato mostrato nel browser", + "send": "Inviare", "january": "Gennaio", "february": "Febbraio", "march": "Marzo", @@ -385,8 +393,24 @@ const strings = { "searching_solution_taking_1": "Ci vuole più tempo del solito, per favore, aspettate...", "searching_solution_taking_2": "Stiamo ancora cercando...", "searching_solution_taking_3": "Non riusciamo a trovare una soluzione, riprovi più tardi.", - "no_solution_found": "Non è stata trovata alcuna soluzione a questo problema. Potete provare a cercare su Google l'errore che avete riscontrato.", - "solution_found": "È stata trovata una soluzione!" + "no_solution_found": "Non è stata trovata alcuna soluzione a questo problema. Puoi provare a cercare su Google l'errore che hai riscontrato.", + "solution_found": "È stata trovata una soluzione!", + "tooltip_settings": "Regolare le impostazioni di Battly a proprio piacimento", + "tooltip_news": "Vedi gli ultimi aggiornamenti", + "tooltip_folder": "Aprire la cartella Battly", + "tooltip_discord": "Unisciti al server Discord", + "tooltip_mods": "Scarica le tue mod preferite da Battly", + "tooltip_music": "Ascoltate la vostra musica preferita quando volete", + "tooltip_friends": "Scoprite a cosa stanno giocando i vostri amici per unirvi a loro.", + "tooptip_instances": "Separate le vostre mod e giocate con i vostri modpack preferiti", + "tooptip_download": "Scarica le versioni di Minecraft", + "tooltip_play": "Riprodurre le versioni scaricate", + "tooltip_accounts": "Gestite i vostri account Battly", + "tooltip_java": "Configura Java", + "tooltip_ram": "Regolare la RAM di Minecraft", + "tooltip_launcher": "Regola il comportamento di Battly", + "tooltip_theme": "Personalizzare i colori di Battly", + "tooltip_background": "Regolare lo sfondo di Battly a proprio piacimento", + "tooltip_save": "Salvare le impostazioni e tornare al menu" }; - export default strings; \ No newline at end of file diff --git a/src/assets/langs/ja.js b/src/assets/langs/ja.js index aa62d32..741831d 100644 --- a/src/assets/langs/ja.js +++ b/src/assets/langs/ja.js @@ -12,7 +12,7 @@ const strings = { "update_downloaded": "アップデートのダウンロード", "update_cancelled": "アップグレード中止", "update_completed": "アップデートがダウンロードされました。Battlyのインストーラーが表示されます。", - "update_error": "アップデートチェック時のエラー：", + "update_error": "更新チェック時のエラー :
", "errkr_connecting_server": "サーバーへの接続にエラーが発生しました。
接続を確認するか、後で再試行してください。", "closing_countdown": "クロージング", "starting_launcher": "スターティング・バトリー", @@ -319,6 +319,14 @@ const strings = { "login_microsoft_accept": "マインクラフトを買った", "login_microsoft_cancel": "マインクラフトは購入していない", "no_accounts_message": "プレイするアカウントを追加します。⚙️ > アカウントを追加", + "checking_if_you_are_premium": "プレミアムかどうかの確認", + "auth_code": "認証コード", + "auth_code_not_set": "認証コードが確立されていない", + "login_with_google": "Googleでログイン", + "login_with_google_msg": "Googleのログインウィンドウが開きます。", + "checking_auth_code": "認証コードのチェック", + "code_login_text": "ブラウザに表示されたコードを入力してください。", + "send": "送信", "january": "1月", "february": "2月", "march": "3月", @@ -386,7 +394,23 @@ const strings = { "searching_solution_taking_2": "私たちはまだ探しています...", "searching_solution_taking_3": "解決策が見つかりません。後でもう一度お試しください。", "no_solution_found": "この問題の解決策は見つかっていません。表示されたエラーについてググってみてください。", - "solution_found": "解決策が見つかった！" + "solution_found": "解決策が見つかった！", + "tooltip_settings": "バトリーの設定を好みに合わせる", + "tooltip_news": "最新情報を見る", + "tooltip_folder": "Battlyフォルダを開く", + "tooltip_discord": "Discordサーバーに参加する", + "tooltip_mods": "Battlyからお気に入りのMODをダウンロード", + "tooltip_music": "好きな時に好きな音楽を聴く", + "tooltip_friends": "友達がプレイしているものを見て、一緒にプレイしよう。", + "tooptip_instances": "MODを分離し、お気に入りのMODパックをプレイできる", + "tooptip_download": "Minecraftバージョンのダウンロード", + "tooltip_play": "ダウンロードしたバージョンを再生する", + "tooltip_accounts": "Battlyアカウントの管理", + "tooltip_java": "Javaの設定", + "tooltip_ram": "マインクラフトのRAMを調整する", + "tooltip_launcher": "バトリーの振る舞いを調整", + "tooltip_theme": "バトリーのカラーをカスタマイズする", + "tooltip_background": "バトリーの背景を好みに調整する", + "tooltip_save": "設定を保存し、メニューに戻る" }; - -export default strings \ No newline at end of file +export default strings; \ No newline at end of file diff --git a/src/assets/langs/pt.js b/src/assets/langs/pt.js index 6738fb3..6f4df58 100644 --- a/src/assets/langs/pt.js +++ b/src/assets/langs/pt.js @@ -1,5 +1,5 @@ const strings = { - "salutate": "Olá!", + "salutate": "¡Hola!", "checking_connection": "Verificar a ligação à Internet", "no_connection": "Não é possível ligar à Internet.
Entrar no modo offline", "starting_battly": "Iniciando Battly", @@ -12,7 +12,7 @@ const strings = { "update_downloaded": "Atualização descarregada", "update_cancelled": "Atualização cancelada", "update_completed": "Atualização descarregada. Será agora encaminhado para o instalador do Battly.", - "update_error": "Erro ao verificar se há actualizações, erro:", + "update_error": "Erro ao verificar se há actualizações, erro :
", "errkr_connecting_server": "Erro ao ligar ao servidor.
Verifique a sua ligação ou tente novamente mais tarde.", "closing_countdown": "Fechar a porta", "starting_launcher": "Iniciando Battly", @@ -23,7 +23,7 @@ const strings = { "open_instance": "Abrir", "open_instance_folder": "Abrir a pasta", "delete_instance": "Eliminar", - "create_instance": "Criar uma instância", + "create_instance": "Criar instância", "edit_instance": "Editar instância", "save_instance": "Guardar instância", "instance_name": "Nome da instância", @@ -319,6 +319,14 @@ const strings = { "login_microsoft_accept": "Comprei o Minecraft", "login_microsoft_cancel": "Não comprei o Minecraft", "no_accounts_message": "Adicionar uma conta para jogar. Prima ⚙️ > Adicionar conta", + "checking_if_you_are_premium": "Verificar se tem prémio", + "auth_code": "Código de autenticação", + "auth_code_not_set": "Código de autenticação não estabelecido", + "login_with_google": "Iniciar sessão com o Google", + "login_with_google_msg": "Será aberta uma janela de início de sessão do Google.", + "checking_auth_code": "Verificação do código de autenticação", + "code_login_text": "Introduza o código que lhe foi apresentado no browser", + "send": "Enviar", "january": "janeiro", "february": "fevereiro", "march": "março", @@ -386,7 +394,23 @@ const strings = { "searching_solution_taking_2": "Ainda estamos à procura de...", "searching_solution_taking_3": "Estamos a ter dificuldades em encontrar uma solução, por favor tente novamente mais tarde.", "no_solution_found": "Não foi encontrada nenhuma solução para este problema. Pode tentar pesquisar no Google o erro que obteve.", - "solution_found": "Foi encontrada uma solução!" + "solution_found": "Foi encontrada uma solução!", + "tooltip_settings": "Ajustar as definições do Battly ao seu gosto", + "tooltip_news": "Ver as últimas actualizações", + "tooltip_folder": "Abrir a pasta Battly", + "tooltip_discord": "Junte-se ao servidor Discord", + "tooltip_mods": "Descarregue os seus mods favoritos do Battly", + "tooltip_music": "Ouça a sua música favorita sempre que quiser", + "tooltip_friends": "Veja o que os seus amigos estão a jogar e junte-se a eles.", + "tooptip_instances": "Separe os seus mods e jogue os seus modpacks favoritos", + "tooptip_download": "Descarregar versões do Minecraft", + "tooltip_play": "Reproduzir as versões descarregadas", + "tooltip_accounts": "Gerir as suas contas Battly", + "tooltip_java": "Configurar Java", + "tooltip_ram": "Ajustar a RAM do Minecraft", + "tooltip_launcher": "Ajusta o comportamento de Battly", + "tooltip_theme": "Personalizar as cores da Battly", + "tooltip_background": "Ajustar o fundo do Battly ao seu gosto", + "tooltip_save": "Guardar as definições e voltar ao menu" }; - export default strings; \ No newline at end of file diff --git a/src/assets/langs/ru.js b/src/assets/langs/ru.js index 99b4aba..f8310a5 100644 --- a/src/assets/langs/ru.js +++ b/src/assets/langs/ru.js @@ -1,5 +1,5 @@ const strings = { - "salutate": "Ола!", + "salutate": "¡Hola!", "checking_connection": "Проверка подключения к Интернету", "no_connection": "Невозможно подключиться к Интернету.
Переход в автономный режим", "starting_battly": "Стартовый баттл", @@ -12,7 +12,7 @@ const strings = { "update_downloaded": "Загруженное обновление", "update_cancelled": "Обновление отменено", "update_completed": "Обновление загружено. Теперь вы перейдете к программе установки Battly.", - "update_error": "Ошибка при проверке обновлений, ошибка:", + "update_error": "Ошибка при проверке обновлений, ошибка :
", "errkr_connecting_server": "Ошибка подключения к серверу.
Проверьте соединение или повторите попытку позже.", "closing_countdown": "Закрытие", "starting_launcher": "Стартовый баттл", @@ -319,6 +319,14 @@ const strings = { "login_microsoft_accept": "Я купил Minecraft", "login_microsoft_cancel": "Я не покупал Minecraft", "no_accounts_message": "Добавьте аккаунт для игры. Нажмите ⚙️ > Добавить аккаунт", + "checking_if_you_are_premium": "Проверьте, есть ли у вас премия", + "auth_code": "Код аутентификации", + "auth_code_not_set": "Код аутентификации не установлен", + "login_with_google": "Войдите в систему с помощью Google", + "login_with_google_msg": "Откроется окно входа в систему Google.", + "checking_auth_code": "Проверка кода аутентификации", + "code_login_text": "Введите код, показанный вам в браузере.", + "send": "Отправить", "january": "Январь", "february": "Февраль", "march": "Март", @@ -386,7 +394,23 @@ const strings = { "searching_solution_taking_2": "Мы все еще ищем...", "searching_solution_taking_3": "У нас возникли проблемы с поиском решения, пожалуйста, повторите попытку позже.", "no_solution_found": "Решение этой проблемы не найдено. Вы можете попробовать поискать в гугле полученную ошибку.", - "solution_found": "Решение найдено!" + "solution_found": "Решение найдено!", + "tooltip_settings": "Настройте параметры Battly по своему вкусу", + "tooltip_news": "Смотрите последние обновления", + "tooltip_folder": "Откройте папку Battly", + "tooltip_discord": "Присоединяйтесь к серверу Discord", + "tooltip_mods": "Загружайте свои любимые моды с Battly", + "tooltip_music": "Слушайте любимую музыку, когда захотите", + "tooltip_friends": "Посмотрите, во что играют ваши друзья, и присоединяйтесь к ним.", + "tooptip_instances": "Разделяйте свои моды и играйте в любимые модпаки", + "tooptip_download": "Скачать версии Minecraft", + "tooltip_play": "Воспроизведение загруженных версий", + "tooltip_accounts": "Управляйте своими счетами Battly", + "tooltip_java": "Настройка Java", + "tooltip_ram": "Настройка оперативной памяти Minecraft", + "tooltip_launcher": "Регулирует поведение Баттли", + "tooltip_theme": "Настройте цвета Battly", + "tooltip_background": "Настройте фон Battly по своему вкусу", + "tooltip_save": "Сохраните настройки и вернитесь в меню" }; - export default strings; \ No newline at end of file diff --git a/src/launcher.html b/src/launcher.html index a509252..edc24bd 100644 --- a/src/launcher.html +++ b/src/launcher.html @@ -191,7 +191,7 @@
-
Battly Launcher 1.8.3
+
Battly Launcher 1.8.4
diff --git a/src/panels/home.html b/src/panels/home.html index e059808..88e5fe1 100644 --- a/src/panels/home.html +++ b/src/panels/home.html @@ -108,39 +108,59 @@

+ @@ -203,8 +260,8 @@

1ly4s0

+ ">------

-
  • Cambiar de cuenta
    • +
  • Soon...

    • \ No newline at end of file diff --git a/src/panels/login.html b/src/panels/login.html index 11d1d5b..a9374ae 100644 --- a/src/panels/login.html +++ b/src/panels/login.html @@ -7,6 +7,20 @@ +