First LimboAuth Try

This commit is contained in:
IkyMax 2024-04-07 01:48:28 -06:00
parent ae0e9e227d
commit f2e1a24c5a
11 changed files with 109 additions and 110 deletions

View File

@ -11,7 +11,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [macos-latest, ubuntu-latest, windows-latest] os: [windows-latest]
steps: steps:
- name: Check out Git repository - name: Check out Git repository

View File

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2017-2024 Daniel D. Scalzi Copyright (c) 2024 Iky Max
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

@ -149,7 +149,7 @@ function updateSelectedAccount(authUser){
username = authUser.displayName username = authUser.displayName
} }
if(authUser.uuid != null){ if(authUser.uuid != null){
document.getElementById('avatarContainer').style.backgroundImage = `url('https://mc-heads.net/body/${authUser.uuid}/right')` document.getElementById('avatarContainer').style.backgroundImage = `url('https://nmsr.lsmp.site/fullbodyiso/${authUser.uuid}')`
} }
} }
user_text.innerHTML = username user_text.innerHTML = username

View File

@ -49,7 +49,7 @@ if(!isDev){
loggerAutoUpdater.info('New update available', info.version) loggerAutoUpdater.info('New update available', info.version)
if(process.platform === 'darwin'){ if(process.platform === 'darwin'){
info.darwindownload = `https://github.com/dscalzi/HeliosLauncher/releases/download/v${info.version}/Helios-Launcher-setup-${info.version}${process.arch === 'arm64' ? '-arm64' : '-x64'}.dmg` info.darwindownload = `https://github.com/Limbo-Studios/LimboLauncher/releases/download/v${info.version}/Limbo-Launcher-setup-${info.version}${process.arch === 'arm64' ? '-arm64' : '-x64'}.dmg`
showUpdateUI(info) showUpdateUI(info)
} }

View File

@ -1,20 +1,19 @@
# Custom Language File for Launcher Customizer # Custom Language File for Launcher Customizer
[ejs.app] [ejs.app]
title = "Helios Launcher" title = "Limbo Launcher"
[ejs.landing] [ejs.landing]
mediaGitHubURL = "https://github.com/dscalzi/HeliosLauncher" mediaGitHubURL = "https://github.com/Limbo-Studios/LimboLauncher"
mediaTwitterURL = "#" mediaTwitterURL = "#"
mediaInstagramURL = "#" mediaInstagramURL = "#"
mediaYouTubeURL = "#" mediaYouTubeURL = "#"
mediaDiscordURL = "https://discord.gg/zNWUXdt" mediaDiscordURL = "#"
[ejs.settings] [ejs.settings]
sourceGithubLink = "https://github.com/dscalZi/HeliosLauncher" sourceGithubLink = "https://github.com/Limbo-Studios/LimboLauncher"
supportLink = "https://github.com/dscalZi/HeliosLauncher/issues" supportLink = "https://github.com/Limbo-Studios/LimboLauncher/issues"
[ejs.welcome] [ejs.welcome]
welcomeHeader = "WELCOME TO WESTEROSCRAFT" welcomeHeader = "BIENVENIDO A LIMBO-STUDIOS"
welcomeDescription = "Our mission is to recreate the universe imagined by author George RR Martin in his fantasy series, A Song of Ice and Fire. Through the collaborative effort of thousands of community members, we have sought to create Westeros as accurately and precisely as possible within Minecraft. The world we are creating is yours to explore. Journey from Dorne to Castle Black, and if you arent afraid, beyond the Wall itself, but best not delay. As the words of House Stark ominously warn: Winter is Coming." welcomeDescription = "Hemos creado este launcher para que puedas disfrutar de nuestros proyectos, el proyecto el curso por ahora es Lurkarya, pero siempre podrán estar atentos a más! Lurkarya es un servidor survival multijugador con lore, ahora estamos en el segundo acto y estamos impacientes por ver que les depará el destino ;)"
welcomeDescCTA = "You are just a few clicks away from Westeros."

View File

@ -1,85 +1,85 @@
[ejs.landing] [ejs.landing]
updateAvailableTooltip = "Update Available" updateAvailableTooltip = "Actualización disponible"
usernamePlaceholder = "Username" usernamePlaceholder = "Usuario"
usernameEditButton = "Edit" usernameEditButton = "Editar"
settingsTooltip = "Settings" settingsTooltip = ""
serverStatus = "SERVER" serverStatus = "SERVIDOR"
serverStatusPlaceholder = "OFFLINE" serverStatusPlaceholder = "OFFLINE"
mojangStatus = "MOJANG STATUS" mojangStatus = "ESTADO DE LIMBOAUTH"
mojangStatusTooltipTitle = "Services" mojangStatusTooltipTitle = "Servicios"
mojangStatusNETitle = "Non Essential" mojangStatusNETitle = "Non Essential"
newsButton = "NEWS" newsButton = "NOTICIAS"
launchButton = "PLAY" launchButton = "JUGAR"
launchButtonPlaceholder = "• No Server Selected" launchButtonPlaceholder = "• Ningún servidor seleccionado"
launchDetails = "Please wait.." launchDetails = "Por favor, espere..."
newsNavigationStatus = "{currentPage} of {totalPages}" newsNavigationStatus = "{currentPage} de {totalPages}"
newsErrorLoadSpan = "Checking for News.." newsErrorLoadSpan = "Buscando noticias..."
newsErrorFailedSpan = "Failed to Load News" newsErrorFailedSpan = "Fallo al cargar noticias."
newsErrorRetryButton = "Try Again" newsErrorRetryButton = "Intentar de nuevo"
newsErrorNoneSpan = "No News" newsErrorNoneSpan = "Sin noticias"
[ejs.login] [ejs.login]
loginCancelText = "Cancel" loginCancelText = "Cancelar"
loginSubheader = "MINECRAFT LOGIN" loginSubheader = "LIMBO LOGIN"
loginEmailError = "* Invalid Value" loginEmailError = "* Valor invalido"
loginEmailPlaceholder = "EMAIL OR USERNAME" loginEmailPlaceholder = "USUARIO"
loginPasswordError = "* Required" loginPasswordError = "* Requerido"
loginPasswordPlaceholder = "PASSWORD" loginPasswordPlaceholder = "CONTRASEÑA"
loginForgotPasswordLink = "https://minecraft.net/password/forgot/" loginForgotPasswordLink = "https://discord.com/channels/1088661129615642716/1095223903636426823"
loginForgotPasswordText = "forgot password?" loginForgotPasswordText = "Olvidaste la contraseña?"
loginRememberMeText = "remember me?" loginRememberMeText = "remember me?"
loginButtonText = "LOGIN" loginButtonText = "LOGIN"
loginNeedAccountLink = "https://minecraft.net/store/minecraft-java-edition/" loginNeedAccountLink = "https://discord.com/channels/1088661129615642716/1095223903636426823"
loginNeedAccountText = "Need an Account?" loginNeedAccountText = "Necesitas una cuenta?"
loginPasswordDisclaimer1 = "Your password is sent directly to mojang and never stored." loginPasswordDisclaimer1 = "Tu contraseña se encripta en un hash y no es almacenada directamente en el launcher ni en LimboAuth."
loginPasswordDisclaimer2 = "{appName} is not affiliated with Mojang AB." loginPasswordDisclaimer2 = "{appName} is not affiliated with Mojang AB."
[ejs.loginOptions] [ejs.loginOptions]
loginOptionsTitle = "Login Options" loginOptionsTitle = "Opciones de Inicio de sesión"
loginWithMicrosoft = "Login with Microsoft" loginWithMicrosoft = "Iniciar sesión con Microsoft"
loginWithMojang = "Login with Mojang" loginWithMojang = "Iniciar sesión con LimboAuth"
cancelButton = "Cancel" cancelButton = "Cancel"
[ejs.overlay] [ejs.overlay]
serverSelectHeader = "Available Servers" serverSelectHeader = "Servidores disponibles"
serverSelectConfirm = "Select" serverSelectConfirm = "Seleccionar"
serverSelectCancel = "Cancel" serverSelectCancel = "Cancelar"
accountSelectHeader = "Select an Account" accountSelectHeader = "Selecciona una Cuenta"
accountSelectConfirm = "Select" accountSelectConfirm = "Seleccionar"
accountSelectCancel = "Cancel" accountSelectCancel = "Cancelar"
[ejs.settings] [ejs.settings]
navHeaderText = "Settings" navHeaderText = "Ajustes"
navAccount = "Account" navAccount = "Cuenta"
navMinecraft = "Minecraft" navMinecraft = "Minecraft"
navMods = "Mods" navMods = "Mods"
navJava = "Java" navJava = "Java"
navLauncher = "Launcher" navLauncher = "Launcher"
navAbout = "About" navAbout = "Acerca de"
navUpdates = "Updates" navUpdates = "Actualizaciones"
navDone = "Done" navDone = "Hecho"
tabAccountHeaderText = "Account Settings" tabAccountHeaderText = "Ajustes de la cuenta"
tabAccountHeaderDesc = "Add new accounts or manage existing ones." tabAccountHeaderDesc = "Añadir o administrar cuentas."
microsoftAccount = "Microsoft" microsoftAccount = "Microsoft"
addMicrosoftAccount = "+ Add Microsoft Account" addMicrosoftAccount = "+ Añadir Cuenta de Microsoft"
mojangAccount = "Mojang" mojangAccount = "Limbo"
addMojangAccount = "+ Add Mojang Account" addMojangAccount = "+ Añadir Cuenta de LimboAuth"
minecraftTabHeaderText = "Minecraft Settings" minecraftTabHeaderText = "Ajustes de Minecraft"
minecraftTabHeaderDesc = "Options related to game launch." minecraftTabHeaderDesc = "Opciones relacionadas al abrir el juego."
gameResolutionTitle = "Game Resolution" gameResolutionTitle = "Resolución del juego"
launchFullscreenTitle = "Launch in fullscreen." launchFullscreenTitle = "Abrir en pantalla completa."
autoConnectTitle = "Automatically connect to the server on launch." autoConnectTitle = "Automaticamente conectar al servidor al abrir."
launchDetachedTitle = "Launch game process detached from launcher." launchDetachedTitle = "Launch game process detached from launcher."
launchDetachedDesc = "If the game is not detached, closing the launcher will also close the game." launchDetachedDesc = "If the game is not detached, closing the launcher will also close the game."
tabModsHeaderText = "Mod Settings" tabModsHeaderText = "Ajustes de mod"
tabModsHeaderDesc = "Enable or disable mods." tabModsHeaderDesc = "Activar o desactivar mods."
switchServerButton = "Switch" switchServerButton = "Switch"
requiredMods = "Required Mods" requiredMods = "Mods requeridos"
optionalMods = "Optional Mods" optionalMods = "Mods opcionales"
dropinMods = "Drop-in Mods" dropinMods = "Drop-in Mods"
addMods = "Add Mods" addMods = "Añadir Mods"
dropinRefreshNote = "(F5 to Refresh)" dropinRefreshNote = "(F5 para actualizar)"
shaderpacks = "Shaderpacks" shaderpacks = "Paquetes de Shaders"
shaderpackDesc = "Enable or disable shaders. Please note, shaders will only run smoothly on powerful setups. You may add custom packs here." shaderpackDesc = "Enable or disable shaders. Please note, shaders will only run smoothly on powerful setups. You may add custom packs here."
selectShaderpack = "Select Shaderpack" selectShaderpack = "Select Shaderpack"
tabJavaHeaderText = "Java Settings" tabJavaHeaderText = "Java Settings"

View File

@ -1,3 +1,3 @@
owner: dscalzi owner: Limbo-Studios
repo: HeliosLauncher repo: LimboLauncher
provider: github provider: github

View File

@ -1,8 +1,8 @@
appId: 'helioslauncher' appId: 'LimboLauncher'
productName: 'Helios Launcher' productName: 'Limbo Launcher'
artifactName: '${productName}-setup-${version}.${ext}' artifactName: '${productName}-setup-${version}.${ext}'
copyright: 'Copyright © 2018-2024 Daniel Scalzi' copyright: 'Copyright © 2024 Limbo-Studios'
asar: true asar: true
compression: 'maximum' compression: 'maximum'
@ -39,10 +39,10 @@ mac:
# Linux Configuration # Linux Configuration
linux: linux:
target: 'AppImage' target: 'AppImage'
maintainer: 'Daniel Scalzi' maintainer: 'IkyMax'
vendor: 'Daniel Scalzi' vendor: 'IkyMax'
synopsis: 'Modded Minecraft Launcher' synopsis: 'Launcher de Limbo-studios para Lurkarya'
description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.' description: 'Custom launcher maded by IkyMax'
category: 'Game' category: 'Game'

44
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "helioslauncher", "name": "Limbolauncher",
"version": "2.2.0", "version": "1.0.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "helioslauncher", "name": "Limbolauncher",
"version": "2.2.0", "version": "1.0.0",
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
"@electron/remote": "^2.1.2", "@electron/remote": "^2.1.2",
@ -18,9 +18,9 @@
"fs-extra": "^11.1.1", "fs-extra": "^11.1.1",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"got": "^11.8.5", "got": "^11.8.5",
"helios-core": "~2.2.0",
"helios-distribution-types": "^1.3.0", "helios-distribution-types": "^1.3.0",
"jquery": "^3.7.1", "jquery": "^3.7.1",
"limbo-core": "~1.0.0",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"semver": "^7.6.0", "semver": "^7.6.0",
"toml": "^3.0.0" "toml": "^3.0.0"
@ -2787,23 +2787,6 @@
"node": ">= 0.4" "node": ">= 0.4"
} }
}, },
"node_modules/helios-core": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.2.0.tgz",
"integrity": "sha512-HGzBwmKF48ax72YTEmIBv7pjMtuaDuYYyC6trmWurF/hFq+AnGTOrefqgD/zRvR2wiuYk78YrUiTIWz1TvE0Pw==",
"dependencies": {
"fastq": "^1.17.1",
"fs-extra": "^11.2.0",
"got": "^11.8.6",
"luxon": "^3.4.4",
"node-stream-zip": "^1.15.0",
"semver": "^7.6.0",
"tar-fs": "^3.0.5",
"triple-beam": "^1.4.1",
"winreg": "^1.2.5",
"winston": "^3.11.0"
}
},
"node_modules/helios-distribution-types": { "node_modules/helios-distribution-types": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/helios-distribution-types/-/helios-distribution-types-1.3.0.tgz", "resolved": "https://registry.npmjs.org/helios-distribution-types/-/helios-distribution-types-1.3.0.tgz",
@ -3249,6 +3232,23 @@
"node": ">= 0.8.0" "node": ">= 0.8.0"
} }
}, },
"node_modules/limbo-core": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/limbo-core/-/limbo-core-1.0.0.tgz",
"integrity": "sha512-IdF9BacvmTE/hVsAQbijJFmrZZjo/yIS+jPJCFqNbszqFioE6mobodruNn36kq6tsGAKIBVjpk5DRgDpIwoUsw==",
"dependencies": {
"fastq": "^1.17.1",
"fs-extra": "^11.2.0",
"got": "^11.8.6",
"luxon": "^3.4.4",
"node-stream-zip": "^1.15.0",
"semver": "^7.6.0",
"tar-fs": "^3.0.5",
"triple-beam": "^1.4.1",
"winreg": "^1.2.5",
"winston": "^3.11.0"
}
},
"node_modules/locate-path": { "node_modules/locate-path": {
"version": "6.0.0", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",

View File

@ -1,13 +1,13 @@
{ {
"name": "helioslauncher", "name": "Limbolauncher",
"version": "2.2.1", "version": "1.0.0",
"productName": "Helios Launcher", "productName": "Limbo Launcher",
"description": "Modded Minecraft Launcher", "description": "Launcher de Limbo-Studios",
"author": "Daniel Scalzi (https://github.com/dscalzi/)", "author": "IkyMax",
"license": "UNLICENSED", "license": "UNLICENSED",
"homepage": "https://github.com/dscalzi/HeliosLauncher", "homepage": "https://github.com/Limbo-Studios/LimboLauncher",
"bugs": { "bugs": {
"url": "https://github.com/dscalzi/HeliosLauncher/issues" "url": "https://github.com/Limbo-Studios/LimboLauncher/issues"
}, },
"private": true, "private": true,
"main": "index.js", "main": "index.js",
@ -32,7 +32,7 @@
"fs-extra": "^11.1.1", "fs-extra": "^11.1.1",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"got": "^11.8.5", "got": "^11.8.5",
"helios-core": "~2.2.0", "limbo-core": "~1.0.0",
"helios-distribution-types": "^1.3.0", "helios-distribution-types": "^1.3.0",
"jquery": "^3.7.1", "jquery": "^3.7.1",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
@ -46,6 +46,6 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/dscalzi/HeliosLauncher.git" "url": "git+https://github.com/Limbo-Studios/LimboLauncher.git"
} }
} }