From 5359e695d2614e079244abeb4ff865bfc8d9e831 Mon Sep 17 00:00:00 2001 From: zumbiepig <121742281+zumbiepig@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:20:49 -0700 Subject: [PATCH] . --- routes/index.ts | 17 ++- server.ts | 2 +- src/game/web/clients/starlike/index.html | 2 +- src/game/web/main/1.11.2/index.html | 2 +- src/game/web/main/1.9.4/index.html | 2 +- .../scripts/eagler-launch/1.8.8/main.ts | 111 ++++++++++++------ .../scripts/eagler-launch/1.9.4/main.ts | 33 ------ src/resources/scripts/google-tag.ts | 9 +- src/sw-full.ts | 7 +- src/sw.ts | 6 +- 10 files changed, 99 insertions(+), 92 deletions(-) delete mode 100644 src/resources/scripts/eagler-launch/1.9.4/main.ts diff --git a/routes/index.ts b/routes/index.ts index 9574359..920d834 100644 --- a/routes/index.ts +++ b/routes/index.ts @@ -1,9 +1,14 @@ -// @ts-nocheck -import { Router } from 'express'; -const indexRouter = Router(); +import { + Router, + type Request, + type Response, + type NextFunction, +} from 'express'; -indexRouter.get('/', async (req, res) => { - // router for future use +const router = Router(); + +router.get('/', (_req: Request, _res: Response, next: NextFunction) => { + next(); }); -export { indexRouter }; +export default router; diff --git a/server.ts b/server.ts index 529d516..35c82b5 100644 --- a/server.ts +++ b/server.ts @@ -16,7 +16,7 @@ import morgan from 'morgan'; import serveFavicon from 'serve-favicon'; import serveStatic from 'serve-static'; -import { indexRouter } from './routes/index.ts'; +import indexRouter from './routes/index.ts'; const BASE_DIR = join(import.meta.dir, 'public'); const PORT = process.env['PORT'] ?? 3000; diff --git a/src/game/web/clients/starlike/index.html b/src/game/web/clients/starlike/index.html index 220b63f..8176489 100644 --- a/src/game/web/clients/starlike/index.html +++ b/src/game/web/clients/starlike/index.html @@ -8,7 +8,7 @@ - + diff --git a/src/game/web/main/1.11.2/index.html b/src/game/web/main/1.11.2/index.html index 263334c..9664ab0 100644 --- a/src/game/web/main/1.11.2/index.html +++ b/src/game/web/main/1.11.2/index.html @@ -9,7 +9,7 @@ - + diff --git a/src/game/web/main/1.9.4/index.html b/src/game/web/main/1.9.4/index.html index 1cf7e70..c4f723a 100644 --- a/src/game/web/main/1.9.4/index.html +++ b/src/game/web/main/1.9.4/index.html @@ -9,7 +9,7 @@ - + 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 2bf76a3..63c873e 100644 --- a/src/resources/scripts/eagler-launch/1.8.8/main.ts +++ b/src/resources/scripts/eagler-launch/1.8.8/main.ts @@ -1,5 +1,41 @@ -// @ts-nocheck import { inflate } from 'pako'; + +declare global { + interface Window { + eaglercraftXOpts: { + container: string; + assetsURI: string; + localesURI?: string; + lang?: string; + joinServer?: string; + worldsDB?: string; + resourcePacksDB?: string; + demoMode?: boolean; + servers: { addr: string; name: string }[]; + relays: { addr: string; comment: string; primary: boolean }[]; + checkShaderGLErrors?: boolean; + enableDownloadOfflineButton?: boolean; + downloadOfflineButtonLink?: string; + html5CursorSupport?: boolean; + allowUpdateSvc?: boolean; + allowUpdateDL?: boolean; + logInvalidCerts?: boolean; + enableSignatureBadge?: boolean; + checkRelaysForUpdates?: boolean; + allowVoiceClient?: boolean; + allowFNAWSkins?: boolean; + localStorageNamespace?: string; + enableMinceraft?: boolean; + hooks?: { + localStorageSaved?: (key: string, data: string) => void; + localStorageLoaded?: (key: string) => string | null; + }; + Mods?: string[]; + }; + main: () => void; + } +} + const storage = { local: { get: function (key: string) { @@ -15,6 +51,7 @@ const storage = { }, }, }; + const base64Gzip = { decompress: function (string: string): string { return inflate( @@ -24,42 +61,40 @@ const base64Gzip = { }, }; -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://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' }, - { 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 randomRelay = Math.floor(Math.random() * 3); +window.eaglercraftXOpts = { + container: 'game_frame', + assetsURI: 'assets.epk', + servers: [ + { addr: 'wss://temuzx.xyz', name: 'TemuzX' }, + { 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' }, + { addr: 'wss://play.brickmc.net', name: 'BrickMC' }, + ], + relays: [ + { + addr: 'wss://relay.deev.is', + comment: 'lax1dude relay #1', + primary: randomRelay === 0, + }, + { + addr: 'wss://relay.lax1dude.net', + comment: 'lax1dude relay #2', + primary: randomRelay === 1, + }, + { + addr: 'wss://relay.shhnowisnottheti.me', + comment: 'ayunami relay #1', + primary: randomRelay === 2, + }, + ], + Mods: storage.local.get('mods') ?? [], +}; - const urlParams = new URLSearchParams(window.location.search); - window.eaglercraftXOpts.joinServer = urlParams.get('server') ?? undefined; - window.eaglercraftXOpts.Mods = storage.local.get('mods') ?? []; +const urlParams = new URLSearchParams(window.location.search); +const server = urlParams.get('server'); +if (server) window.eaglercraftXOpts.joinServer = server; - history.replaceState({}, '', '/play'); - main(); -}); +window.onload = () => window.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 deleted file mode 100644 index 8f0d28a..0000000 --- a/src/resources/scripts/eagler-launch/1.9.4/main.ts +++ /dev/null @@ -1,33 +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://temuzx.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, - }, - ], - }; - - const urlParams = new URLSearchParams(window.location.search); - window.eaglercraftXOpts.joinServer = urlParams.get('server') ?? undefined; - - history.replaceState({}, '', '/play'); - main(); -}); diff --git a/src/resources/scripts/google-tag.ts b/src/resources/scripts/google-tag.ts index 1beca01..0b6b8f0 100644 --- a/src/resources/scripts/google-tag.ts +++ b/src/resources/scripts/google-tag.ts @@ -1,4 +1,9 @@ -// @ts-nocheck +declare global { + interface Window { + dataLayer: unknown[]; + } +} + const googleTag = document.createElement('script'); googleTag.async = true; googleTag.src = 'https://www.googletagmanager.com/gtag/js?id=G-GD4SJRCR7Z'; @@ -6,7 +11,7 @@ document.head.appendChild(googleTag); window.dataLayer = window.dataLayer || []; function gtag(...args: unknown[]) { - dataLayer.push(...args); + window.dataLayer.push(...args); } gtag('js', new Date()); gtag('config', 'G-GD4SJRCR7Z'); diff --git a/src/sw-full.ts b/src/sw-full.ts index 4b55651..af1c30f 100644 --- a/src/sw-full.ts +++ b/src/sw-full.ts @@ -1,6 +1,4 @@ -// @ts-nocheck -/* -const cacheVersion = '1.6'; +/* const cacheVersion = '1.6'; const cacheName = `minexlauncher-full-v${cacheVersion}`; self.addEventListener('install', (event) => { @@ -57,5 +55,4 @@ self.addEventListener('fetch', (event) => { return response ?? fetch(event.request); }), ); -}); -*/ +}); */ diff --git a/src/sw.ts b/src/sw.ts index 2700f31..e486a08 100644 --- a/src/sw.ts +++ b/src/sw.ts @@ -1,5 +1,4 @@ -// @ts-nocheck -/*const CACHE_VERSION = '1.6'; +/* const CACHE_VERSION = '1.6'; const OFFLINE_URL = '/offline/'; const CACHE_ASSETS = [ OFFLINE_URL, @@ -89,5 +88,4 @@ self.addEventListener('fetch', (event) => { }), ); } -}); -*/ +}); */