From 5a5209cd4601444e0ad14fbcf174a8368c28396a Mon Sep 17 00:00:00 2001
From: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
Date: Thu, 29 Aug 2024 09:02:54 -0700
Subject: [PATCH] update launch

---
 .../scripts/eagler-launch/1.5.2/main.ts       | 27 ++++++++++++++-----
 .../scripts/eagler-launch/1.8.8/main.ts       | 11 ++++----
 .../scripts/eagler-launch/1.9.4/main.ts       | 20 +++++---------
 .../scripts/eagler-launch/b1.3/main.ts        |  9 ++++---
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/resources/scripts/eagler-launch/1.5.2/main.ts b/src/resources/scripts/eagler-launch/1.5.2/main.ts
index 8868446..92bf105 100644
--- a/src/resources/scripts/eagler-launch/1.5.2/main.ts
+++ b/src/resources/scripts/eagler-launch/1.5.2/main.ts
@@ -10,18 +10,31 @@ window.addEventListener('load', function () {
 			{ serverName: 'BrickMC', serverAddress: 'wss://play.brickmc.net', hideAddress: false },
 		],
 		relays: [
-			{ addr: 'wss://relay.deev.is/', name: 'lax1dude relay #1', primary: relayId == 0 },
-			{ addr: 'wss://relay.lax1dude.net/', name: 'lax1dude relay #2', primary: relayId == 1 },
-			{ addr: 'wss://relay.shhnowisnottheti.me/', name: 'ayunami relay #1', primary: relayId == 2 },
+			{ addr: 'wss://relay.deev.is/', name: 'lax1dude relay #1', primary: relayId === 0 },
+			{ addr: 'wss://relay.lax1dude.net/', name: 'lax1dude relay #2', primary: relayId === 1 },
+			{ addr: 'wss://relay.shhnowisnottheti.me/', name: 'ayunami relay #1', primary: relayId === 2 },
 		],
-		mainMenu: { splashes: ['Darviglet!', 'eaglerenophile!', 'You Eagler!', 'Yeeeeeee!', 'yeee', 'EEEEEEEEE!', 'You Darvig!', 'You Vigg!', ':>', '|>', 'You Yumpster!'], eaglerLogo: false },
+		mainMenu: {
+			splashes: [
+				'Darviglet!',
+				'eaglerenophile!',
+				'You Eagler!',
+				'Yeeeeeee!',
+				'yeee',
+				'EEEEEEEEE!',
+				'You Darvig!',
+				'You Vigg!',
+				':>',
+				'|>',
+				'You Yumpster!'
+			],
+			eaglerLogo: false
+		},
 	};
 
 	const urlParams = new URLSearchParams(window.location.search);
 	const server = urlParams.get('server');
-	if (server) {
-		window.eaglercraftOpts.joinServer = server;
-	}
+	if (server) window.eaglercraftOpts.joinServer = server;
 
 	main();
 });
diff --git a/src/resources/scripts/eagler-launch/1.8.8/main.ts b/src/resources/scripts/eagler-launch/1.8.8/main.ts
index 306e0ec..4965d68 100644
--- a/src/resources/scripts/eagler-launch/1.8.8/main.ts
+++ b/src/resources/scripts/eagler-launch/1.8.8/main.ts
@@ -10,16 +10,15 @@ window.addEventListener('load', () => {
 			{ addr: 'wss://mc.lamplifesteal.xyz', name: 'LampLifesteal' },
 		],
 		relays: [
-			{ addr: 'wss://relay.deev.is/', comment: 'lax1dude relay #1', primary: relayId == 0 },
-			{ addr: 'wss://relay.lax1dude.net/', comment: 'lax1dude relay #2', primary: relayId == 1 },
-			{ addr: 'wss://relay.shhnowisnottheti.me/', comment: 'ayunami relay #1', primary: relayId == 2 },
+			{ addr: 'wss://relay.deev.is/', comment: 'lax1dude relay #1', primary: relayId === 0 },
+			{ addr: 'wss://relay.lax1dude.net/', comment: 'lax1dude relay #2', primary: relayId === 1 },
+			{ addr: 'wss://relay.shhnowisnottheti.me/', comment: 'ayunami relay #1', primary: relayId === 2 },
 		],
 	};
 
 	const urlParams = new URLSearchParams(window.location.search);
 	const server = urlParams.get('server');
-	if (server) {
-		window.eaglercraftXOpts.joinServer = server;
-	}
+	if (server) window.eaglercraftXOpts.joinServer = urlParams.get('server');
+
 	main();
 });
diff --git a/src/resources/scripts/eagler-launch/1.9.4/main.ts b/src/resources/scripts/eagler-launch/1.9.4/main.ts
index ede13ae..fb2f11f 100644
--- a/src/resources/scripts/eagler-launch/1.9.4/main.ts
+++ b/src/resources/scripts/eagler-launch/1.9.4/main.ts
@@ -4,25 +4,19 @@ window.addEventListener('load', () => {
 	window.eaglercraftXOpts = {
 		container: 'game_frame',
 		assetsURI: 'assets.epk',
-		servers: [{ addr: 'wss://eagler.xyz', name: 'TemuzX' }],
+		servers: [
+			{ addr: 'wss://eagler.xyz', name: 'TemuzX' },
+		],
 		relays: [
-			{ addr: 'wss://relay.deev.is/', comment: 'lax1dude relay #1', primary: relayId == 0 },
-			{ addr: 'wss://relay.lax1dude.net/', comment: 'lax1dude relay #2', primary: relayId == 1 },
-			{ addr: 'wss://relay.shhnowisnottheti.me/', comment: 'ayunami relay #1', primary: relayId == 2 },
+			{ addr: 'wss://relay.deev.is/', comment: 'lax1dude relay #1', primary: relayId === 0 },
+			{ addr: 'wss://relay.lax1dude.net/', comment: 'lax1dude relay #2', primary: relayId === 1 },
+			{ addr: 'wss://relay.shhnowisnottheti.me/', comment: 'ayunami relay #1', primary: relayId === 2 },
 		],
 	};
 
 	const urlParams = new URLSearchParams(window.location.search);
 	const server = urlParams.get('server');
-	const mobile = urlParams.get('mobile');
-	if (server) {
-		window.eaglercraftXOpts.joinServer = server;
-	}
-	if (mobile === 'true') {
-		const script = document.createElement('script');
-		script.src = '/resources/scripts/mobile/eaglerpocketmobile.user.js';
-		document.head.appendChild(script);
-	}
+	if (server) window.eaglercraftXOpts.joinServer = server;
 
 	main();
 });
diff --git a/src/resources/scripts/eagler-launch/b1.3/main.ts b/src/resources/scripts/eagler-launch/b1.3/main.ts
index 0f27acc..03d685d 100644
--- a/src/resources/scripts/eagler-launch/b1.3/main.ts
+++ b/src/resources/scripts/eagler-launch/b1.3/main.ts
@@ -1,12 +1,13 @@
 // @ts-nocheck
 window.addEventListener('load', function () {
-	window.minecraftOpts = ['game_frame', 'assets.epk'];
+	window.minecraftOpts = [
+		'game_frame',
+		'assets.epk'
+	];
 
 	const urlParams = new URLSearchParams(window.location.search);
 	const server = urlParams.get('server');
-	if (server) {
-		window.minecraftOpts.push(s);
-	}
+	if (server) window.minecraftOpts.push(s);
 
 	main();
 });