From 627fbd48d7878147c660553a0ade70752040053d Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Sat, 14 Sep 2024 14:36:35 +0200 Subject: [PATCH] v1 --- {.github => .gitea}/workflows/build.yml | 0 .github/FUNDING.yml | 3 - app/assets/images/title.png | Bin 0 -> 14805 bytes app/assets/js/configmanager.js | 2 +- app/assets/js/custom.js | 4 + app/assets/js/distromanager.js | 2 +- app/assets/js/processbuilder.js | 82 +- app/assets/js/scripts/loginOptions.js | 9 - app/assets/lang/_custom.toml | 12 +- app/landing.ejs | 8 +- app/loginOptions.ejs | 11 - authlib-injector-1.2.5.jar | Bin 0 -> 341970 bytes build/icon.png | Bin 145930 -> 1574 bytes distribution.json | 449 ++ distribution_dev.json | 449 ++ docs/sample_distribution.json | 1584 ---- electron-builder.yml | 8 +- package-lock.json | 9752 ++++++++++++----------- package.json | 8 +- patches/helios-core+2.2.1.patch | 26 + 20 files changed, 6046 insertions(+), 6363 deletions(-) rename {.github => .gitea}/workflows/build.yml (100%) delete mode 100644 .github/FUNDING.yml create mode 100644 app/assets/images/title.png create mode 100644 app/assets/js/custom.js create mode 100644 authlib-injector-1.2.5.jar create mode 100644 distribution.json create mode 100644 distribution_dev.json delete mode 100644 docs/sample_distribution.json create mode 100644 patches/helios-core+2.2.1.patch diff --git a/.github/workflows/build.yml b/.gitea/workflows/build.yml similarity index 100% rename from .github/workflows/build.yml rename to .gitea/workflows/build.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index e338313..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -github: dscalzi -patreon: dscalzi -custom: ['https://www.paypal.me/dscalzi'] diff --git a/app/assets/images/title.png b/app/assets/images/title.png new file mode 100644 index 0000000000000000000000000000000000000000..7a337f75b985e68a87e2afe835efd8a6cac6e865 GIT binary patch literal 14805 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 { + packwizUrl: "https://patatapack.oier.ovh/pack.toml" + packwizBootstrap: "packwiz-installer-bootstrap.jar" +} \ No newline at end of file diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 8ae8ca0..63df719 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -4,7 +4,7 @@ const ConfigManager = require('./configmanager') // Old WesterosCraft url. // exports.REMOTE_DISTRO_URL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json' -exports.REMOTE_DISTRO_URL = 'https://helios-files.geekcorner.eu.org/distribution.json' +exports.REMOTE_DISTRO_URL = 'https://distribution.oier.ovh/distribution.json' const api = new DistributionAPI( ConfigManager.getLauncherDirectory(), diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 0e95562..7954e06 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -7,7 +7,7 @@ const { getMojangOS, isLibraryCompatible, mcVersionAtLeast } = require('helios- const { Type } = require('helios-distribution-types') const os = require('os') const path = require('path') - +const Custom = require('./custom') const ConfigManager = require('./configmanager') const logger = LoggerUtil.getLogger('ProcessBuilder') @@ -70,10 +70,84 @@ class ProcessBuilder { //args = args.concat(this.constructModArguments(modObj.fMods)) args = args.concat(this.constructModList(modObj.fMods)) } + /*const preLaunchArgs = [ + "-jar", + Custom.getCustomConfig().packwizBootstrap, + Custom.getCustomConfig().packwizUrl + ]*/ - logger.info('Launch Arguments:', args) + const preLaunchArgsArray = [ + // "-version" + "-jar", + //path.join(this.gameDir, "packwiz-installer-bootstrap.jar"), + "packwiz-installer-bootstrap.jar", + "https://patatapack.oier.ovh/pack/pack.toml" + ] + const preLaunchArgs = [ + "-jar " + + path.join(this.gameDir, "/packwiz-installer-bootstrap.jar") + + " https://patatapack.oier.ovh/pack.toml" + ] + + logger.info('PreLaunch Arguments:', preLaunchArgs) + logger.info('getJavaExecutable:', ConfigManager.getJavaExecutable(this.server.rawServer.id)) + ; + logger.info('Server RAW id:', this.server.rawServer.id) + logger.info('gamedir:', this.gameDir) + //const preLaunchChild = child_process.execSync(ConfigManager.getJavaExecutable(this.server.rawServer.id) +" " + preLaunchArgsArray.join(' '), preLaunchArgsArray, { + const preLaunchChild = child_process.spawnSync(ConfigManager.getJavaExecutable(this.server.rawServer.id), preLaunchArgsArray, { + + cwd: this.gameDir, + // detached: ConfigManager.getLaunchDetached() + }) + const authArgs = [ + "-Dminecraft.api.env=custom", + "-Dminecraft.api.auth.host=https://auth.oier.ovh", + "-Dminecraft.api.account.host=https://auth.oier.ovh/user", + "-Dminecraft.api.session.host=https://auth.oier.ovh/api/yggdrasil", + "-Dminecraft.api.services.host=https://auth.oier.ovh/api/yggdrasil" + ] + args = authArgs.concat(args) + + //preLaunchChild.on('close', (preLaunchCode, preLaunchSignal) => { + //logger.info('PRELAUNCH Exited with code', preLaunchCode) + logger.info('Launch Arguments:', args) + + const child = child_process.spawn(ConfigManager.getJavaExecutable(this.server.rawServer.id), args, { + cwd: this.gameDir, + detached: ConfigManager.getLaunchDetached() + }) + + if(ConfigManager.getLaunchDetached()){ + child.unref() + } + + child.stdout.setEncoding('utf8') + child.stderr.setEncoding('utf8') + + child.stdout.on('data', (data) => { + data.trim().split('\n').forEach(x => console.log(`\x1b[32m[Minecraft]\x1b[0m ${x}`)) + + }) + child.stderr.on('data', (data) => { + data.trim().split('\n').forEach(x => console.log(`\x1b[31m[Minecraft]\x1b[0m ${x}`)) + }) + child.on('close', (code, signal) => { + logger.info('Exited with code', code) + fs.remove(tempNativePath, (err) => { + if(err){ + logger.warn('Error while deleting temp dir', err) + } else { + logger.info('Temp dir deleted successfully.') + } + }) + }) + + //return child + return child + // }); - const child = child_process.spawn(ConfigManager.getJavaExecutable(this.server.rawServer.id), args, { + /* const child = child_process.spawn(ConfigManager.getJavaExecutable(this.server.rawServer.id), args, { cwd: this.gameDir, detached: ConfigManager.getLaunchDetached() }) @@ -103,7 +177,7 @@ class ProcessBuilder { }) }) - return child + return child */ } /** diff --git a/app/assets/js/scripts/loginOptions.js b/app/assets/js/scripts/loginOptions.js index cdb1bc8..77ff847 100644 --- a/app/assets/js/scripts/loginOptions.js +++ b/app/assets/js/scripts/loginOptions.js @@ -18,15 +18,6 @@ function loginOptionsCancelEnabled(val){ } } -loginOptionMicrosoft.onclick = (e) => { - switchView(getCurrentView(), VIEWS.waiting, 500, 500, () => { - ipcRenderer.send( - MSFT_OPCODE.OPEN_LOGIN, - loginOptionsViewOnLoginSuccess, - loginOptionsViewOnLoginCancel - ) - }) -} loginOptionMojang.onclick = (e) => { switchView(getCurrentView(), VIEWS.login, 500, 500, () => { diff --git a/app/assets/lang/_custom.toml b/app/assets/lang/_custom.toml index da17faf..0ff90b9 100644 --- a/app/assets/lang/_custom.toml +++ b/app/assets/lang/_custom.toml @@ -1,20 +1,20 @@ # Custom Language File for Launcher Customizer [ejs.app] -title = "Helios Launcher" +title = "PatataLauncher" [ejs.landing] -mediaGitHubURL = "https://github.com/dscalzi/HeliosLauncher" +mediaGitHubURL = "#" mediaTwitterURL = "#" mediaInstagramURL = "#" mediaYouTubeURL = "#" -mediaDiscordURL = "https://discord.gg/zNWUXdt" +mediaDiscordURL = "#" [ejs.settings] sourceGithubLink = "https://github.com/dscalZi/HeliosLauncher" supportLink = "https://github.com/dscalZi/HeliosLauncher/issues" [ejs.welcome] -welcomeHeader = "WELCOME TO WESTEROSCRAFT" -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 aren’t afraid, beyond the Wall itself, but best not delay. As the words of House Stark ominously warn: Winter is Coming." -welcomeDescCTA = "You are just a few clicks away from Westeros." +welcomeHeader = "Ongi etorri Patata!" +welcomeDescription = "Patata launcher." +welcomeDescCTA = "Go go go" diff --git a/app/landing.ejs b/app/landing.ejs index 5ac72a1..911b1c1 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -100,13 +100,13 @@ <%- lang('landing.serverStatusPlaceholder') %>
-
+ + < !-- Essential Mojang services are populated here. -- >
@@ -114,10 +114,10 @@
- + < !-- Non Essential Mojang services are populated here. -- >
- + --> diff --git a/app/loginOptions.ejs b/app/loginOptions.ejs index 20aa67c..b095da0 100644 --- a/app/loginOptions.ejs +++ b/app/loginOptions.ejs @@ -3,17 +3,6 @@

<%- lang('loginOptions.loginOptionsTitle') %>

-
- -