diff --git a/LurkaryaSMP.json b/LurkaryaSMP.json index 24728a0f..edb4e1b1 100644 --- a/LurkaryaSMP.json +++ b/LurkaryaSMP.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "rss": "", + "rss": "https://social.lsmp.site/@limbo.rss", "discord": { "clientId": "1089465027486035978", "smallImageText": "LSMP", diff --git a/app/assets/images/icons/mojang.bak b/app/assets/images/icons/mojang.bak new file mode 100644 index 00000000..e1116b41 --- /dev/null +++ b/app/assets/images/icons/mojang.bak @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/assets/images/icons/mojang.svg b/app/assets/images/icons/mojang.svg index e1116b41..0a18c3fa 100644 --- a/app/assets/images/icons/mojang.svg +++ b/app/assets/images/icons/mojang.svg @@ -1,5 +1,46 @@ - - - - - \ No newline at end of file + + + + diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index fd1abd8b..618f2aee 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -273,6 +273,10 @@ exports.getClientToken = function(){ exports.setClientToken = function(clientToken){ config.clientToken = clientToken } +/** + * + * @param {string} PlayerMeta + */ /** * Retrieve the ID of the selected serverpack. @@ -652,6 +656,7 @@ exports.setJVMOptions = function(serverid, jvmOptions){ config.javaConfig[serverid].jvmOptions = jvmOptions } + // Game Settings /** diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index bb03b6f5..b03cc7e3 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://raw.githubusercontent.com/Limbo-Studios/LimboLauncher/master/LurkaryaSMP.json' const api = new DistributionAPI( ConfigManager.getLauncherDirectory(), diff --git a/app/assets/js/ipcconstants.js b/app/assets/js/ipcconstants.js index a1cd6385..2fedb67c 100644 --- a/app/assets/js/ipcconstants.js +++ b/app/assets/js/ipcconstants.js @@ -1,7 +1,8 @@ // NOTE FOR THIRD-PARTY // REPLACE THIS CLIENT ID WITH YOUR APPLICATION ID. // SEE https://github.com/dscalzi/HeliosLauncher/blob/master/docs/MicrosoftAuth.md -exports.AZURE_CLIENT_ID = '1ce6e35a-126f-48fd-97fb-54d143ac6d45' +//exports.AZURE_CLIENT_ID = 'c8f958a0-3a28-44f4-88da-ae2bdcb64788' +exports.AZURE_CLIENT_ID = '52a394c2-2284-4a97-ad09-3d6b46bdf5e4' // SEE NOTE ABOVE. diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 9416b2d1..52c30587 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -10,6 +10,7 @@ const path = require('path') const ConfigManager = require('./configmanager') + const logger = LoggerUtil.getLogger('ProcessBuilder') @@ -368,13 +369,16 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=HeliosLauncher') + args.push('-Xdock:name=LimboLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) args.push('-Xms' + ConfigManager.getMinRAM(this.server.rawServer.id)) args = args.concat(ConfigManager.getJVMOptions(this.server.rawServer.id)) args.push('-Djava.library.path=' + tempNativePath) + args.push(`-javaagent:${path.join(process.cwd(), 'resources', 'libraries', 'java', 'LimboAuth.jar')}=https://auth.lsmp.site/authlib-injector`) + args.push('-Dauthlibinjector.side=client') + args.push('-Dauthlibinjector.yggdrasil.prefetched=eyJtZXRhIjp7ImltcGxlbWVudGF0aW9uTmFtZSI6IkRyYXNsIiwiaW1wbGVtZW50YXRpb25WZXJzaW9uIjoiMS4wLjEiLCJsaW5rcyI6eyJob21lcGFnZSI6Imh0dHBzOi8vYXV0aC5sc21wLnNpdGUiLCJyZWdpc3RlciI6Imh0dHBzOi8vYXV0aC5sc21wLnNpdGUvZHJhc2wvcmVnaXN0cmF0aW9uIn0sInNlcnZlck5hbWUiOiJMaW1ibyIsImZlYXR1cmUuZW5hYmxlX3Byb2ZpbGVfa2V5Ijp0cnVlfSwic2lnbmF0dXJlUHVibGlja2V5IjoiLS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS1cbk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBeEpjeUkySlZ2YnoydVEzWGtuTm1cbmkzR1FhMHFVUmxxV2FsdGgzNEcreTMyeUJSWlFiVUVuM05HV0hFOVcrdGs3OG95WGQ2bHduWngyMlJJeVJjRlNcbnhPeFhDcW1DUTJpWmFWZi9KVE4vNG1VWmJnaWk4RU9DeVptT3dwZmp5RTJQZXFkQ1BaaHlVdExLYS82djhxVnlcbmRNSGZhMzV4Uml3UGtQdkdaQ3FJcmhRaktLcGxLaWJ1MzRzR1hDNy9hQXlBMXpqRXZoeFoyRjJLS0gwbzc5c2Jcbk16cmtML1N0alZDbnlnMVhCQUJ2ZDdBUENlTkViaytOamlTY0JLNExBTmpSZ2tqV2RQZjZRZ0lSRWJNN05TbTBcbk8yZGI3VmlWYVI3Q1FhMTlUa1Z2MHRTR3hCY1EyYmZiWk9teWtKK2ZtMDdBdUp2ek5qekRmMDZPNEdCckZVOUhcbjFkaWN4Q0wrM2grZzZvL0JiNUk3LzBGaVdId2xrUDNsRzhhQVk5clFhcm5OakxsZENrakN5Rmw4Y24zNENnWDBcbnNhNnN3Mkh2YUdqaEd1bldsazQvUjU0UUw4YVVVcGsrVzh2YzFaV2JOL3VONVRRNWZ6NDQyWmF5QnlJNkxqUlZcbjRXMXhnaS9adVNsc0dKZlgrdEdkTXNyTmNpbVZUakpNQUlIMUEwM2kyTWl3dmJsbmI1ZzRLM0hoZWtOakRUZ05cbmxKUXlGR1BQZmN6dkNwSFdITk5NODlaWlBweVhOZmZBbjltV21VaXFOTjM2WHR1SkxyTTFnTnJ5K3hwMnJic3dcbnduNEthUlpTcGFpencvUzd3cnlLN0lvNXpXb1R6aVZoM0RJblovUXZrb1NPMThMVWdBekpheVNvdWd5UFRWRnhcblNQY1ZoOWVEcit4aVoydit2RlFLMFJNQ0F3RUFBUT09XG4tLS0tLUVORCBQVUJMSUMgS0VZLS0tLS1cbiIsInNpZ25hdHVyZVB1YmxpY2tleXMiOlsiLS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS1cbk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBeEpjeUkySlZ2YnoydVEzWGtuTm1cbmkzR1FhMHFVUmxxV2FsdGgzNEcreTMyeUJSWlFiVUVuM05HV0hFOVcrdGs3OG95WGQ2bHduWngyMlJJeVJjRlNcbnhPeFhDcW1DUTJpWmFWZi9KVE4vNG1VWmJnaWk4RU9DeVptT3dwZmp5RTJQZXFkQ1BaaHlVdExLYS82djhxVnlcbmRNSGZhMzV4Uml3UGtQdkdaQ3FJcmhRaktLcGxLaWJ1MzRzR1hDNy9hQXlBMXpqRXZoeFoyRjJLS0gwbzc5c2Jcbk16cmtML1N0alZDbnlnMVhCQUJ2ZDdBUENlTkViaytOamlTY0JLNExBTmpSZ2tqV2RQZjZRZ0lSRWJNN05TbTBcbk8yZGI3VmlWYVI3Q1FhMTlUa1Z2MHRTR3hCY1EyYmZiWk9teWtKK2ZtMDdBdUp2ek5qekRmMDZPNEdCckZVOUhcbjFkaWN4Q0wrM2grZzZvL0JiNUk3LzBGaVdId2xrUDNsRzhhQVk5clFhcm5OakxsZENrakN5Rmw4Y24zNENnWDBcbnNhNnN3Mkh2YUdqaEd1bldsazQvUjU0UUw4YVVVcGsrVzh2YzFaV2JOL3VONVRRNWZ6NDQyWmF5QnlJNkxqUlZcbjRXMXhnaS9adVNsc0dKZlgrdEdkTXNyTmNpbVZUakpNQUlIMUEwM2kyTWl3dmJsbmI1ZzRLM0hoZWtOakRUZ05cbmxKUXlGR1BQZmN6dkNwSFdITk5NODlaWlBweVhOZmZBbjltV21VaXFOTjM2WHR1SkxyTTFnTnJ5K3hwMnJic3dcbnduNEthUlpTcGFpencvUzd3cnlLN0lvNXpXb1R6aVZoM0RJblovUXZrb1NPMThMVWdBekpheVNvdWd5UFRWRnhcblNQY1ZoOWVEcit4aVoydit2RlFLMFJNQ0F3RUFBUT09XG4tLS0tLUVORCBQVUJMSUMgS0VZLS0tLS1cbiIsIi0tLS0tQkVHSU4gUFVCTElDIEtFWS0tLS0tXG5NSUlDSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQWc4QU1JSUNDZ0tDQWdFQXlsQjRCNm01bHo3andyY0Z6NkZkXG4vZm5mVWhjdmx4c1RTbjVrSUsvMmFHRzFDM2tNeTRWamh3bHhGNkJGVVNuZnhoTnN3UGpoM1ppdGtCeEVBRlkyXG41dXprSkZSd0h3VkE5bWR3amFzaFhJTHRSNk9xZExYWEZWeVVQSVVSTE9TV3FHTkJ0YjA4RU41Zk1uRzhpRkxnXG5FSklCTXhzOUJ2RjNzMy9GaHVIeVBLaVZUWm1YWTBXWTRaeVlxdm9LUitYamFUUlBQdkJzRGE0V0kydTF6eFhNXG5lSGxvZFQzbG5DelZ2eU9ZQkxYTDZDSmdCeXVPeGNjSjhoblhmRjl5WTRGMGFlTDA4MEp6LzMrRUJORzhSTzRCXG55aHRCZjROeThOUTZzdFdzamZlVUl2SDdiVS80ekNZY1lPcTRXckluWEhxUzhxcnVEbUlsN1A1WFhHY2FidXpRXG5zdFBmL2gyQ1JBVXBQL1BsSFhjTWx2ZXdqbUdVNk1mREsrbGlmU2NOWXdqUHhSbzRuS1RHRlpmLzBhcUhDaC9FXG5Bc1F5TEtyT0lZUkUwbERHM2J6Qmg4b2dJTUxBdWdzQWZCYjZNM21xQ3FLYVRNQWYvVkFqaDVGRkpualMrN2JFXG4rYlpFVjBxd2F4MUNFb1BQSkwxZklRak9TOHpqMDg2Z2pwR1JDdFN5OStiVFBUZlRSL1NKK1ZVQjVHMkllQ0l0XG5rTkhwSlgyeWdvakZaOW41Rm5qN1I5Wm5PTStMOG55SWpQdTNhZVB2dGNyWGx5TGhIL2h2T2ZJT2pQeE9scVcrXG5PNVF3U0ZQNE9FY3lMQVVnRGRVZ3lXMzZaNW1CMjg1dUtXL2lnaHpac09UZXZWVUcyUXdESXRPYklWNmk4UkN4XG5GYk4yb0RIeVBhTzVqMXRUYUJOeVZ0OENBd0VBQVE9PVxuLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tXG4iLCItLS0tLUJFR0lOIFBVQkxJQyBLRVktLS0tLVxuTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUFyYTRZMnd1M3JXRVc3Y0RURFJSZFxuNEl2VUQxNDBZMTJTYUczazRWM1V3VC9wRG5uWDVpdE9jWWlaQTBxZjRWQ3BKRHAyUGlmT0wrUHIvcGgvRzkvNlxuWm9JeGtCZUdFTm8rUzdpOUJxaXpKeTljbVpvY3B5eCtSa1phdzkrZnJDR05MdVlMcnh6aU5XaVhGQUNKU2cybVxuSEFDUjcrNk5rR044ZC8xNi8zUHhNbnZHU3lMVDdKS0dVZ3FqMVEzb1c3aytOTFhSOXN3Nm9SRUxPY25VdlpWYVxuMmJjZ2x2OHZsY3lQcXFuQmh5ZExmSEk4NVo1V25JWVp2aVozQmI0ZHY1Rm1lNzI2QkdPdEVZN2t6NDBSZml3alxuVDN4WUtZS1BKVVMzL2NyUFg2ZXVnbVd5cldkZGRLYWVQclc4OGJwMTdaNU5JU3RsSjVLSkprNGNvaGE4TytQN1xub25EcW1iSHdMcVBUZVI1MW5qa2daK0RKV1Q2Zno4a3U5T1dRbjZJL0Z4cU4xNGlZSWdoREppam1LdkV3c0k3RlxuSjVYMnR0UFhFdkJZTG1wajJqMGxRUWNVSXFIN2hraVorbUNXMEdZYXdKZ2JBZU5BcmFNOXNQKzc2TXlBR0lUdFxuQXNYdjFJUW1haCs3T2VESk9Ub0cyS2IxRGwwVmErSGlQOU1QcGNuTzdrYm42ZHFBeWhOdlJObUhuc1VPaUVjTFxuaFc5Ums3eHo4N0lCVi9jR0tiVURneHU4Y1lZMFA1MTJEV3Q1K0ptcjhXMTBGREZkTG1rSnQxdGFXeE54QXBNMlxuQ2lGUENpbWswMmtveUxaRFc5bnFwV053NnFTL1RPWVBkejQzOHFFdWFtdFlVSit1NldoQmpLOHhBSkVBdDVrM1xuZ0RLWCtubFRpRzNONnNlMDlENjJmUzhDQXdFQUFRPT1cbi0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLVxuIl0sInNraW5Eb21haW5zIjpbImF1dGgubHNtcC5zaXRlIiwidGV4dHVyZXMubWluZWNyYWZ0Lm5ldCJdfQ==') // Main Java Class args.push(this.modManifest.mainClass) @@ -419,13 +423,29 @@ class ProcessBuilder { // Java Arguments if(process.platform === 'darwin'){ - args.push('-Xdock:name=HeliosLauncher') + args.push('-Xdock:name=LimboLauncher') args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns')) } - args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) - args.push('-Xms' + ConfigManager.getMinRAM(this.server.rawServer.id)) - args = args.concat(ConfigManager.getJVMOptions(this.server.rawServer.id)) + const current = ConfigManager.getSelectedAccount() + if (current.type === 'microsoft') { + args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) + args.push('-Xms' + ConfigManager.getMinRAM(this.server.rawServer.id)) + args = args.concat(ConfigManager.getJVMOptions(this.server.rawServer.id)) + } else { + args.push('-Xmx' + ConfigManager.getMaxRAM(this.server.rawServer.id)) + args.push('-Xms' + ConfigManager.getMinRAM(this.server.rawServer.id)) + args = args.concat(ConfigManager.getJVMOptions(this.server.rawServer.id)) + args.push('-Duser.language=es') + args.push('-Dminecraft.api.env=custom') + args.push('-Dminecraft.api.auth.host=https://auth.lsmp.site/authlib-injector/authserver') + args.push('-Dminecraft.api.account.host=https://auth.lsmp.site/authlib-injector/api') + args.push('-Dminecraft.api.session.host=https://auth.lsmp.site/authlib-injector/sessionserver') + args.push('-Dminecraft.api.services.host=https://auth.lsmp.site/authlib-injector/minecraftservices') + args.push(`-javaagent:${path.join(process.cwd(), 'resources', 'libraries', 'java', 'LimboAuth.jar')}=https://auth.lsmp.site/authlib-injector`) + args.push('-Dauthlibinjector.yggdrasil.prefetched=eyJtZXRhIjp7ImltcGxlbWVudGF0aW9uTmFtZSI6IkRyYXNsIiwiaW1wbGVtZW50YXRpb25WZXJzaW9uIjoiMS4wLjEiLCJsaW5rcyI6eyJob21lcGFnZSI6Imh0dHBzOi8vYXV0aC5sc21wLnNpdGUiLCJyZWdpc3RlciI6Imh0dHBzOi8vYXV0aC5sc21wLnNpdGUvZHJhc2wvcmVnaXN0cmF0aW9uIn0sInNlcnZlck5hbWUiOiJMaW1ibyIsImZlYXR1cmUuZW5hYmxlX3Byb2ZpbGVfa2V5Ijp0cnVlfSwic2lnbmF0dXJlUHVibGlja2V5IjoiLS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS1cbk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBeEpjeUkySlZ2YnoydVEzWGtuTm1cbmkzR1FhMHFVUmxxV2FsdGgzNEcreTMyeUJSWlFiVUVuM05HV0hFOVcrdGs3OG95WGQ2bHduWngyMlJJeVJjRlNcbnhPeFhDcW1DUTJpWmFWZi9KVE4vNG1VWmJnaWk4RU9DeVptT3dwZmp5RTJQZXFkQ1BaaHlVdExLYS82djhxVnlcbmRNSGZhMzV4Uml3UGtQdkdaQ3FJcmhRaktLcGxLaWJ1MzRzR1hDNy9hQXlBMXpqRXZoeFoyRjJLS0gwbzc5c2Jcbk16cmtML1N0alZDbnlnMVhCQUJ2ZDdBUENlTkViaytOamlTY0JLNExBTmpSZ2tqV2RQZjZRZ0lSRWJNN05TbTBcbk8yZGI3VmlWYVI3Q1FhMTlUa1Z2MHRTR3hCY1EyYmZiWk9teWtKK2ZtMDdBdUp2ek5qekRmMDZPNEdCckZVOUhcbjFkaWN4Q0wrM2grZzZvL0JiNUk3LzBGaVdId2xrUDNsRzhhQVk5clFhcm5OakxsZENrakN5Rmw4Y24zNENnWDBcbnNhNnN3Mkh2YUdqaEd1bldsazQvUjU0UUw4YVVVcGsrVzh2YzFaV2JOL3VONVRRNWZ6NDQyWmF5QnlJNkxqUlZcbjRXMXhnaS9adVNsc0dKZlgrdEdkTXNyTmNpbVZUakpNQUlIMUEwM2kyTWl3dmJsbmI1ZzRLM0hoZWtOakRUZ05cbmxKUXlGR1BQZmN6dkNwSFdITk5NODlaWlBweVhOZmZBbjltV21VaXFOTjM2WHR1SkxyTTFnTnJ5K3hwMnJic3dcbnduNEthUlpTcGFpencvUzd3cnlLN0lvNXpXb1R6aVZoM0RJblovUXZrb1NPMThMVWdBekpheVNvdWd5UFRWRnhcblNQY1ZoOWVEcit4aVoydit2RlFLMFJNQ0F3RUFBUT09XG4tLS0tLUVORCBQVUJMSUMgS0VZLS0tLS1cbiIsInNpZ25hdHVyZVB1YmxpY2tleXMiOlsiLS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS1cbk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBeEpjeUkySlZ2YnoydVEzWGtuTm1cbmkzR1FhMHFVUmxxV2FsdGgzNEcreTMyeUJSWlFiVUVuM05HV0hFOVcrdGs3OG95WGQ2bHduWngyMlJJeVJjRlNcbnhPeFhDcW1DUTJpWmFWZi9KVE4vNG1VWmJnaWk4RU9DeVptT3dwZmp5RTJQZXFkQ1BaaHlVdExLYS82djhxVnlcbmRNSGZhMzV4Uml3UGtQdkdaQ3FJcmhRaktLcGxLaWJ1MzRzR1hDNy9hQXlBMXpqRXZoeFoyRjJLS0gwbzc5c2Jcbk16cmtML1N0alZDbnlnMVhCQUJ2ZDdBUENlTkViaytOamlTY0JLNExBTmpSZ2tqV2RQZjZRZ0lSRWJNN05TbTBcbk8yZGI3VmlWYVI3Q1FhMTlUa1Z2MHRTR3hCY1EyYmZiWk9teWtKK2ZtMDdBdUp2ek5qekRmMDZPNEdCckZVOUhcbjFkaWN4Q0wrM2grZzZvL0JiNUk3LzBGaVdId2xrUDNsRzhhQVk5clFhcm5OakxsZENrakN5Rmw4Y24zNENnWDBcbnNhNnN3Mkh2YUdqaEd1bldsazQvUjU0UUw4YVVVcGsrVzh2YzFaV2JOL3VONVRRNWZ6NDQyWmF5QnlJNkxqUlZcbjRXMXhnaS9adVNsc0dKZlgrdEdkTXNyTmNpbVZUakpNQUlIMUEwM2kyTWl3dmJsbmI1ZzRLM0hoZWtOakRUZ05cbmxKUXlGR1BQZmN6dkNwSFdITk5NODlaWlBweVhOZmZBbjltV21VaXFOTjM2WHR1SkxyTTFnTnJ5K3hwMnJic3dcbnduNEthUlpTcGFpencvUzd3cnlLN0lvNXpXb1R6aVZoM0RJblovUXZrb1NPMThMVWdBekpheVNvdWd5UFRWRnhcblNQY1ZoOWVEcit4aVoydit2RlFLMFJNQ0F3RUFBUT09XG4tLS0tLUVORCBQVUJMSUMgS0VZLS0tLS1cbiIsIi0tLS0tQkVHSU4gUFVCTElDIEtFWS0tLS0tXG5NSUlDSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQWc4QU1JSUNDZ0tDQWdFQXlsQjRCNm01bHo3andyY0Z6NkZkXG4vZm5mVWhjdmx4c1RTbjVrSUsvMmFHRzFDM2tNeTRWamh3bHhGNkJGVVNuZnhoTnN3UGpoM1ppdGtCeEVBRlkyXG41dXprSkZSd0h3VkE5bWR3amFzaFhJTHRSNk9xZExYWEZWeVVQSVVSTE9TV3FHTkJ0YjA4RU41Zk1uRzhpRkxnXG5FSklCTXhzOUJ2RjNzMy9GaHVIeVBLaVZUWm1YWTBXWTRaeVlxdm9LUitYamFUUlBQdkJzRGE0V0kydTF6eFhNXG5lSGxvZFQzbG5DelZ2eU9ZQkxYTDZDSmdCeXVPeGNjSjhoblhmRjl5WTRGMGFlTDA4MEp6LzMrRUJORzhSTzRCXG55aHRCZjROeThOUTZzdFdzamZlVUl2SDdiVS80ekNZY1lPcTRXckluWEhxUzhxcnVEbUlsN1A1WFhHY2FidXpRXG5zdFBmL2gyQ1JBVXBQL1BsSFhjTWx2ZXdqbUdVNk1mREsrbGlmU2NOWXdqUHhSbzRuS1RHRlpmLzBhcUhDaC9FXG5Bc1F5TEtyT0lZUkUwbERHM2J6Qmg4b2dJTUxBdWdzQWZCYjZNM21xQ3FLYVRNQWYvVkFqaDVGRkpualMrN2JFXG4rYlpFVjBxd2F4MUNFb1BQSkwxZklRak9TOHpqMDg2Z2pwR1JDdFN5OStiVFBUZlRSL1NKK1ZVQjVHMkllQ0l0XG5rTkhwSlgyeWdvakZaOW41Rm5qN1I5Wm5PTStMOG55SWpQdTNhZVB2dGNyWGx5TGhIL2h2T2ZJT2pQeE9scVcrXG5PNVF3U0ZQNE9FY3lMQVVnRGRVZ3lXMzZaNW1CMjg1dUtXL2lnaHpac09UZXZWVUcyUXdESXRPYklWNmk4UkN4XG5GYk4yb0RIeVBhTzVqMXRUYUJOeVZ0OENBd0VBQVE9PVxuLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tXG4iLCItLS0tLUJFR0lOIFBVQkxJQyBLRVktLS0tLVxuTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUFyYTRZMnd1M3JXRVc3Y0RURFJSZFxuNEl2VUQxNDBZMTJTYUczazRWM1V3VC9wRG5uWDVpdE9jWWlaQTBxZjRWQ3BKRHAyUGlmT0wrUHIvcGgvRzkvNlxuWm9JeGtCZUdFTm8rUzdpOUJxaXpKeTljbVpvY3B5eCtSa1phdzkrZnJDR05MdVlMcnh6aU5XaVhGQUNKU2cybVxuSEFDUjcrNk5rR044ZC8xNi8zUHhNbnZHU3lMVDdKS0dVZ3FqMVEzb1c3aytOTFhSOXN3Nm9SRUxPY25VdlpWYVxuMmJjZ2x2OHZsY3lQcXFuQmh5ZExmSEk4NVo1V25JWVp2aVozQmI0ZHY1Rm1lNzI2QkdPdEVZN2t6NDBSZml3alxuVDN4WUtZS1BKVVMzL2NyUFg2ZXVnbVd5cldkZGRLYWVQclc4OGJwMTdaNU5JU3RsSjVLSkprNGNvaGE4TytQN1xub25EcW1iSHdMcVBUZVI1MW5qa2daK0RKV1Q2Zno4a3U5T1dRbjZJL0Z4cU4xNGlZSWdoREppam1LdkV3c0k3RlxuSjVYMnR0UFhFdkJZTG1wajJqMGxRUWNVSXFIN2hraVorbUNXMEdZYXdKZ2JBZU5BcmFNOXNQKzc2TXlBR0lUdFxuQXNYdjFJUW1haCs3T2VESk9Ub0cyS2IxRGwwVmErSGlQOU1QcGNuTzdrYm42ZHFBeWhOdlJObUhuc1VPaUVjTFxuaFc5Ums3eHo4N0lCVi9jR0tiVURneHU4Y1lZMFA1MTJEV3Q1K0ptcjhXMTBGREZkTG1rSnQxdGFXeE54QXBNMlxuQ2lGUENpbWswMmtveUxaRFc5bnFwV053NnFTL1RPWVBkejQzOHFFdWFtdFlVSit1NldoQmpLOHhBSkVBdDVrM1xuZ0RLWCtubFRpRzNONnNlMDlENjJmUzhDQXdFQUFRPT1cbi0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLVxuIl0sInNraW5Eb21haW5zIjpbImF1dGgubHNtcC5zaXRlIiwidGV4dHVyZXMubWluZWNyYWZ0Lm5ldCJdfQ==') + } + //estoy hasta los uebos, saquenme de aquí :3 // Main Java Class args.push(this.modManifest.mainClass) diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index 81a65a70..caba0269 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -639,6 +639,30 @@ function populateAuthAccounts(){ const acc = authAccounts[val] const accHtml = `
+
+ ${acc.displayName} +
+
+
+
+
${Lang.queryJS('settings.authAccountPopulate.username')}
+
${acc.displayName}
+
+
+
${Lang.queryJS('settings.authAccountPopulate.uuid')}
+
${acc.uuid}
+
+
+
+ +
+ +
+
+
+
` + + const accHtml2 = `
${acc.displayName}
@@ -663,7 +687,7 @@ function populateAuthAccounts(){
` if(acc.type === 'microsoft') { - microsoftAuthAccountStr += accHtml + microsoftAuthAccountStr += accHtml2 } else { mojangAuthAccountStr += accHtml } diff --git a/libraries/java/LimboAuth.jar b/libraries/java/LimboAuth.jar new file mode 100644 index 00000000..dc50e5b4 Binary files /dev/null and b/libraries/java/LimboAuth.jar differ diff --git a/resources/libraries/java/LimboAuth.jar b/resources/libraries/java/LimboAuth.jar new file mode 100644 index 00000000..dc50e5b4 Binary files /dev/null and b/resources/libraries/java/LimboAuth.jar differ diff --git a/resources/libraries/java/PackXZExtract.jar b/resources/libraries/java/PackXZExtract.jar new file mode 100644 index 00000000..9a779a74 Binary files /dev/null and b/resources/libraries/java/PackXZExtract.jar differ