From a3057e4cf9d57ed22cc82caaccc13d30d078e60f Mon Sep 17 00:00:00 2001 From: zumbiepig <121742281+zumbiepig@users.noreply.github.com> Date: Mon, 9 Sep 2024 18:59:08 -0700 Subject: [PATCH] add webmc oneblock to servers --- src/game/web/clients/eaglerforge/index.html | 2 +- .../eagler-launch/1.8.8/eaglerforge.ts | 45 ------------------- .../scripts/eagler-launch/1.8.8/main.ts | 2 + 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts diff --git a/src/game/web/clients/eaglerforge/index.html b/src/game/web/clients/eaglerforge/index.html index 5834153..1ac29c9 100644 --- a/src/game/web/clients/eaglerforge/index.html +++ b/src/game/web/clients/eaglerforge/index.html @@ -12,7 +12,7 @@ - + diff --git a/src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts b/src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts deleted file mode 100644 index 6ceeb4e..0000000 --- a/src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts +++ /dev/null @@ -1,45 +0,0 @@ -// @ts-nocheck -window.addEventListener('load', () => { - const relayId = Math.floor(Math.random() * 3); - window.eaglercraftXOpts = { - container: 'game_frame', - assetsURI: `${window.location.pathname}/assets.epk`, - localesURI: `${window.location.pathname}/lang/`, - servers: [ - { addr: 'wss://mc.ricenetwork.xyz', name: 'Rice Network' }, - { addr: 'wss://mc.lamplifesteal.xyz', name: 'LampLifesteal' }, - { addr: 'wss://electronmc.club', name: 'Electron Network' }, - { addr: 'wss://play.brickmc.net', name: 'BrickMC' }, - ], - 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 }, - ], - }; - - const storage = { - local: { - get: function (key: string) { - const item = localStorage.getItem('minexlauncher'); - if (item !== null) { - const json = JSON.parse(item); - if (json[key] !== undefined) { - return json[key]; - } else { - return null; - } - } else { - return null; - } - }, - }, - }; - - const urlParams = new URLSearchParams(window.location.search); - window.eaglercraftXOpts.joinServer = urlParams.get('server') ?? undefined; - window.eaglercraftXOpts.Mods = storage.local.get('mods') ?? []; - - history.replaceState({}, '', '/play'); - 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 13e6d29..e12eecd 100644 --- a/src/resources/scripts/eagler-launch/1.8.8/main.ts +++ b/src/resources/scripts/eagler-launch/1.8.8/main.ts @@ -6,6 +6,7 @@ window.addEventListener('load', () => { assetsURI: `${window.location.pathname}/assets.epk`, localesURI: `${window.location.pathname}/lang/`, servers: [ + { addr: 'wss://webmc.xyz/server', name: 'WebMC OneBlock' }, { addr: 'wss://mc.ricenetwork.xyz', name: 'Rice Network' }, { addr: 'wss://mc.lamplifesteal.xyz', name: 'LampLifesteal' }, { addr: 'wss://electronmc.club', name: 'Electron Network' }, @@ -20,6 +21,7 @@ window.addEventListener('load', () => { const urlParams = new URLSearchParams(window.location.search); window.eaglercraftXOpts.joinServer = urlParams.get('server') ?? undefined; + window.eaglercraftXOpts.mods = storage.local.get('mods') ?? []; history.replaceState({}, '', '/play'); main();