Merge pull request #58 from zumbiepig/dev

1.5
2025-06-08 09:24:48 +00:00 · 2024-08-21 15:02:08 -07:00 · 2024-08-21 15:02:08 -07:00 · d923ae3018
commit d923ae3018
parent b2aeb39050 76a4700794
113 changed files with 562 additions and 412 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,12 @@
-.DS_Store
+# Build artifacts
+/public/assets.json
 /public/resources/scripts/
+/public/sw.js
+/public/sw-full.js
+
+# System files
+.desktop.ini
+.DS_Store

 # Logs
 logs
--- a/README.md
+++ b/README.md
@ -1,5 +1,12 @@
 # MineXLauncher

+## Variables to update when changing version number
+
+- `cacheVersion` in [sw.ts](/src/sw.ts) and [sw-full.ts](/src/sw-full.ts)
+- `launcherVersion` in [main.ts](/src/resources/scripts/main.ts)
+- Changelog in [main.ts](/src/resources/scripts/main.ts)
+- Changelog on [updates page](/public/updates/index.html)
+
 ## Client versions

 - Update both web and offline at the same time if possible
--- a/eslint.config.js
+++ b/eslint.config.js
@ -1,4 +1,15 @@
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';

-export default tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended);
+export default tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended, {
+	rules: {
+		'@typescript-eslint/ban-ts-comment': [
+			'error',
+			{
+				'ts-expect-error': false,
+				'ts-nocheck': false,
+				'ts-check': true,
+			},
+		],
+	},
+});
--- a/generateAssetsList.js
+++ b/generateAssetsList.js
@ -0,0 +1,21 @@
+import { readdirSync, statSync, writeFileSync } from 'fs';
+import { join } from 'path';
+
+const directoryPath = join(import.meta.dirname, 'public');
+
+function getFiles(dir, files_) {
+	files_ = files_ || [];
+	const files = readdirSync(dir);
+	for (let i in files) {
+		const name = dir + '/' + files[i];
+		if (statSync(name).isDirectory()) {
+			getFiles(name, files_);
+		} else {
+			files_.push(name.replace(`${import.meta.dirname}/public`, '').replace('/index.html', '/'));
+		}
+	}
+	return files_;
+}
+
+const assets = getFiles(directoryPath);
+writeFileSync(join(import.meta.dirname, '/public/assets.json'), JSON.stringify(assets, null, 2));
--- a/package.json
+++ b/package.json
@ -5,10 +5,11 @@
 	"main": "./server.js",
 	"scripts": {
 		"start": "node ./server.js",
-		"build": "npm run build:clean && npm run build:compile && npm run build:obfuscate",
-		"build:clean": "rimraf ./public/resources/scripts",
+		"build": "npm run build:clean && npm run build:compile && npm run build:obfuscate && npm run build:generateAssetsList",
+		"build:clean": "rimraf ./public/resources/scripts ./public/assets.json",
 		"build:compile": "tsc",
 		"build:obfuscate": "javascript-obfuscator ./public/resources/scripts --output ./public/resources/scripts --options-preset high-obfuscation",
+		"build:generateAssetsList": "node ./generateAssetsList.js",
 		"lint": "eslint ./src",
 		"lint:fix": "eslint --fix ./src"
 	},
--- a/public/404.html
+++ b/public/404.html
@ -14,7 +14,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="main-panel">
--- a/public/home/archive/index.html
+++ b/public/home/archive/index.html
@ -13,7 +13,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -33,9 +33,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item" onclick="navigate.mods.mods()">
+						<li class="nav-item" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
--- a/public/home/clients/index.html
+++ b/public/home/clients/index.html
@ -13,7 +13,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -33,9 +33,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item" onclick="navigate.mods.mods()">
+						<li class="nav-item" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
--- a/public/home/downloads/index.html
+++ b/public/home/downloads/index.html
@ -13,7 +13,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -33,9 +33,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item" onclick="navigate.mods.mods()">
+						<li class="nav-item" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
--- a/public/home/game/index.html
+++ b/public/home/game/index.html
@ -13,7 +13,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -33,9 +33,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item" onclick="navigate.mods.mods()">
+						<li class="nav-item" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
--- a/public/index.html
+++ b/public/index.html
@ -6,9 +6,10 @@
 		<title>MineXLauncher</title>
 		<link rel="icon" type="image/webp" href="/resources/images/icons/favicon.webp" />
 		<link rel="stylesheet" href="/resources/styles/index.css" />
+		<link rel="manifest" href="/manifest.json" />
 		<link rel="canonical" href="https://launcher.orionzleon.me/" />
 		<meta name="theme-color" content="#333" />
-		<meta name="description" content="Custom launcher for Eaglercraft, which contains many versions and clients." />
+		<meta name="description" content="MineXLauncher is a custom launcher for Eaglercraft that has many versions and clients." />
 		<meta
 			name="keywords"
 			content="minex, minexlauncher, launcher, custom launcher, modded minecraft, modded, minecraft, minecraft eaglercraft, eaglercraft, eaglercraftx, eaglercraftl, eagler, eaglerx, eaglerl, download, unblocked, minecraft versions, 1.2.5, 1.5.2, 1.5, 1.8, 1.8.8, 1.9, 1.9.4, 1.12, 1.3, 1.7.3, b1.3, b1.7.3, alpha, alpha 1.2.6, beta, beta 1.3, beta 1.7.3, a1.2.6, resent, shadow, client, resent client, shadow client, cracked, crack, cracked minecraft, hack, hacked, hacks, hacked client, hack client, free minecraft, pvp, minecraft download, offline, online, web, host, hosted, servers, multiplayer, custom launcher, skins, packs, textures, resource, mods, mod, mod download, pack download, texture download, texture pack download, fps, high fps, better fps, high fps, speed, fast, faster, lag, laggy, no lag, eaglerforge, forge, javascript, hack launcher, exploits, cheats, grief, griefing, mine"
@ -17,36 +18,9 @@
 		<meta property="og:type" content="website" />
 		<meta property="og:image" content="/resources/images/icons/favicon.webp" />
 		<meta property="og:url" content="https://launcher.orionzleon.me/" />
-		<meta property="og:description" content="Custom launcher for Eaglercraft, which contains many versions and clients." />
+		<meta property="og:description" content="MineXLauncher is a custom launcher for Eaglercraft that has many versions and clients." />
 		<meta property="og:locale" content="en-US" />
 		<script src="/resources/scripts/google-tag.js"></script>
-		<script src="/sw-register.js"></script>
 		<script src="/resources/scripts/main.js"></script>
-		<script>
-			const iframe = document.createElement('iframe');
-			const lastPage = storage.session.get('lastPage');
-
-			if (storage.local.get('lastVersion') === null) {
-				iframe.src = '/welcome.html';
-				alert(`MineXLauncher has been updated to v1.4!
-
-Changes in v1.4:
-  - Added welcome and setup screen
-  - Show changelog when MineXLauncher is updated
-  - Added themes and backgrounds
-  - Settings now update automatically without saving them
-  - Username rules have been updated to match Minecraft
-  - Added Starlike Client`);
-			} else if (lastPage !== null) {
-				iframe.src = lastPage;
-			} else if (detect.mobile()) {
-				iframe.src = '/mobile/';
-			} else {
-				iframe.src = '/home/game/';
-			}
-			document.addEventListener('DOMContentLoaded', function () {
-				document.body.appendChild(iframe);
-			});
-		</script>
 	</head>
 </html>
--- a/public/manifest.json
+++ b/public/manifest.json
@ -0,0 +1,39 @@
+{
+	"name": "MineXLauncher",
+	"short_name": "MineX",
+	"description": "MineXLauncher is a custom launcher for Eaglercraft that has many versions and clients.",
+	"id": "/",
+	"start_url": "/",
+	"theme_color": "#333",
+	"background_color": "#333",
+	"orientation": "landscape",
+	"display": "standalone",
+	"display_override": ["fullscreen"],
+	"categories": ["games"],
+	"icons": [
+		{
+			"src": "/resources/manifest/icons/any/192x192.webp",
+			"sizes": "192x192",
+			"type": "image/webp"
+		},
+		{
+			"src": "/resources/manifest/icons/any/512x512.webp",
+			"sizes": "512x512",
+			"type": "image/webp"
+		},
+		{
+			"src": "/resources/manifest/icons/maskable/2275x2275.webp",
+			"sizes": "2275x2275",
+			"type": "image/webp",
+			"purpose": "maskable"
+		}
+	],
+	"screenshots": [
+		{
+			"src": "/resources/manifest/screenshots/home.webp",
+			"sizes": "1366x768",
+			"type": "image/webp",
+			"form_factor": "wide"
+		}
+	]
+}
--- a/public/mobile/index.html
+++ b/public/mobile/index.html
@ -13,7 +13,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
--- a/public/mods/client/index.html
+++ b/public/mods/client/index.html
@ -13,7 +13,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -33,9 +33,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item selected" onclick="navigate.mods.mods()">
+						<li class="nav-item selected" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
--- a/public/mods/mods/index.html
+++ b/public/mods/mods/index.html
@ -14,7 +14,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -34,9 +34,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item selected" onclick="navigate.mods.mods()">
+						<li class="nav-item selected" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
--- a/public/mods/resourcepacks/index.html
+++ b/public/mods/resourcepacks/index.html
@ -14,7 +14,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -34,9 +34,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item selected" onclick="navigate.mods.mods()">
+						<li class="nav-item selected" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
--- a/public/offline.html
+++ b/public/offline.html
@ -14,7 +14,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="main-panel">
--- a/public/resources/data/mods.json
+++ b/public/resources/data/mods.json
@ -1,226 +0,0 @@
-{
-	"mods": [
-		{
-			"display-name": "Burmod WIP",
-			"mod-name": "burmod",
-			"author": "Murturtle",
-			"author-link": "https://github.com/Murturtle",
-			"description": "client for eaglerforge (v0.2)",
-			"icon": "/resources/images/icons/mods/all.webp",
-			"repo-link": "https://github.com/Murturtle/Burmod",
-			"download-link": "/resources/mods/burmod.js"
-		},
-		{
-			"display-name": "StatsHud",
-			"mod-name": "statshud",
-			"author": "Neverflagastralis",
-			"author-link": "https://github.com/AstralisLLC",
-			"description": "An all-new StatsHud, soon to be updated with customization functionality!",
-			"icon": "/resources/images/icons/mods/statshud.webp",
-			"repo-link": "https://github.com/AstralisLLC/EaglerForge-Mods/blob/main/StatsHudV3.js",
-			"download-link": "/resources/mods/statshud.js"
-		},
-		{
-			"display-name": "FreshEaglerUI",
-			"mod-name": "freshui",
-			"author": "Murturtle",
-			"author-link": "https://github.com/Murturtle",
-			"description": "Makes the UIs slide in and re works the main screen!",
-			"icon": "/resources/images/icons/mods/all.webp",
-			"repo-link": "https://github.com/Murturtle/MursMods/blob/main/FreshEaglerUI.js",
-			"download-link": "/resources/mods/freshui.js"
-		},
-		{
-			"display-name": "Chat commands mod",
-			"mod-name": "chatcmd",
-			"author": "Neverflagastralis",
-			"author-link": "https://github.com/AstralisLLC",
-			"description": "An open source mod with a built in customizable bug reports system!",
-			"icon": "/resources/images/icons/mods/all.webp",
-			"repo-link": "https://github.com/AstralisLLC/EaglerForge-Mods/blob/main/chat%20utils.js",
-			"download-link": "/resources/mods/chatcmd.js"
-		},
-		{
-			"display-name": "SemiAutoLogin",
-			"mod-name": "autologin",
-			"author": "Murturtle",
-			"author-link": "https://github.com/Murturtle",
-			"description": "Press L to login without typing!",
-			"icon": "/resources/images/icons/mods/all.webp",
-			"repo-link": "https://github.com/Murturtle/MursMods/blob/main/SemiAutoLogin.js",
-			"download-link": "/resources/mods/autologin.js"
-		},
-		{
-			"display-name": "Blur",
-			"mod-name": "blur",
-			"author": "Murturtle",
-			"author-link": "https://github.com/Murturtle",
-			"description": "Makes your fps 5 when unfocused!",
-			"icon": "/resources/images/icons/mods/blur.webp",
-			"repo-link": "https://github.com/Murturtle/MursMods/blob/main/Blur.js",
-			"download-link": "/resources/mods/blur.js"
-		},
-		{
-			"display-name": "Jetpack",
-			"mod-name": "jetpack",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "allows you to fly as if you had a jetpack. keybind(hold): h",
-			"icon": "/resources/images/icons/mods/jetpack.webp",
-			"repo-link": "https://github.com/radmanplays/eaglerreborn-plugins/blob/main/jetpack-ef.js",
-			"download-link": "/resources/mods/jetpack.js"
-		},
-		{
-			"display-name": "Barney's Music Mod",
-			"mod-name": "barneysmusicmod",
-			"author": "BarneyTheGod",
-			"author-link": "https://github.com/BarneyCompiler",
-			"description": "Plays a users music through a direct mp3 link. Saves music through Local Browser storage.",
-			"icon": "/resources/images/icons/mods/barneysmusicmod.webp",
-			"repo-link": "https://github.com/BarneyCompiler/barneysmods/blob/main/Barneys%20Music%20Player",
-			"download-link": "/resources/mods/barneysmusicmod.js"
-		},
-		{
-			"display-name": "Blink",
-			"mod-name": "blinkmod",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "use by typing the .blinkon and .blinkoff commands and sending it",
-			"icon": "/resources/images/icons/mods/all.webp",
-			"repo-link": "https://github.com/radmanplays/eaglerreborn-plugins",
-			"download-link": "/resources/mods/blinkmod.js"
-		},
-		{
-			"display-name": "GrappleHook",
-			"mod-name": "graplehookmod",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "grappling hook mod. how to use: 1.grab a fishing rod 2.use the fishing rod 3.grappling hook! ",
-			"icon": "/resources/images/icons/mods/graplehookmod.webp",
-			"repo-link": "https://github.com/radmanplays/eaglerreborn-plugins",
-			"download-link": "/resources/mods/graplehookmod.js"
-		},
-		{
-			"display-name": "Xray",
-			"mod-name": "xraymod",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "simple xray mod. its recommended to use this with Fullbright. keybind: x",
-			"icon": "/resources/images/icons/mods/xraymod.webp",
-			"repo-link": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/Xray.js",
-			"download-link": "/resources/mods/xraymod.js"
-		},
-		{
-			"display-name": "Fullbright",
-			"mod-name": "fullbright",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "full bright mod for eaglerforge. keybind(enabled by default): f",
-			"icon": "/resources/images/icons/mods/fullbright.webp",
-			"repo-link": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/fullbright.js",
-			"download-link": "/resources/mods/fullbright.js"
-		},
-		{
-			"display-name": "Autoclicker",
-			"mod-name": "autoclicker",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "this mod clicks for you",
-			"icon": "/resources/images/icons/mods/autoclicker.webp",
-			"repo-link": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/autoclicker.js",
-			"download-link": "/resources/mods/autoclicker.js"
-		},
-		{
-			"display-name": "Speed Mod",
-			"mod-name": "speedmod",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "makes you faster",
-			"icon": "/resources/images/icons/mods/speedmod.webp",
-			"repo-link": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/Speed.js",
-			"download-link": "/resources/mods/speedmod.js"
-		},
-		{
-			"display-name": "Chat Shortcuts",
-			"mod-name": "chatshortcutsmod",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "shortcuts: {health}, {pos}, {name}, {me}, {x}, {y}, {z}, {level}, {walked}, {chunk}",
-			"icon": "/resources/images/icons/mods/all.webp",
-			"repo-link": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/ChatShortcuts.js",
-			"download-link": "/resources/mods/chatshortcutsmod.js"
-		},
-		{
-			"display-name": "NoFall",
-			"mod-name": "nofallmod",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "makes you not take fall damage",
-			"icon": "/resources/images/icons/mods/all.webp",
-			"repo-link": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/NoFall.js",
-			"download-link": "/resources/mods/nofallmod.js"
-		},
-		{
-			"display-name": "AutoFish",
-			"mod-name": "autofishmod",
-			"author": "radmanplays",
-			"author-link": "https://github.com/radmanplays",
-			"description": "fishes for you. just throw a fishing rod in water to use this mod",
-			"icon": "/resources/images/icons/mods/all.webp",
-			"repo-link": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/AutoFish.js",
-			"download-link": "/resources/mods/autofishmod.js"
-		}
-	],
-	"resourcepacks": [
-		{
-			"display-name": "Barebones Bossbars",
-			"mod-name": "barebones-bossbars",
-			"author": "vexcenot",
-			"author-link": "https://modrinth.com/user/vexcenot",
-			"description": "simplistic per-mob icons and colors to decorate boss bars with",
-			"icon": "/resources/images/icons/resourcepacks/barebones-bossbars.webp",
-			"repo-link": "https://modrinth.com/resourcepack/barebones-bossbars",
-			"download-link": "/resources/resourcepacks/barebones-bossbars.zip"
-		},
-		{
-			"display-name": "Daggers",
-			"mod-name": "daggers",
-			"author": "devin",
-			"author-link": "https://modrinth.com/user/devin",
-			"description": "Shorter swords for better visibility.",
-			"icon": "/resources/images/icons/resourcepacks/daggers.webp",
-			"repo-link": "https://modrinth.com/resourcepack/daggers",
-			"download-link": "/resources/resourcepacks/daggers.zip"
-		},
-		{
-			"display-name": "Faithful (32x)",
-			"mod-name": "faithful-32x",
-			"author": "Faithful-Resource-Pack",
-			"author-link": "https://modrinth.com/user/Faithful-Resource-Pack",
-			"description": "The original Minecraft texture feel, with double the resolution and double the fun!",
-			"icon": "/resources/images/icons/resourcepacks/faithful-32x.webp",
-			"repo-link": "https://modrinth.com/resourcepack/faithful-32x",
-			"download-link": "/resources/resourcepacks/faithful-32x.zip"
-		},
-		{
-			"display-name": "Low On Fire",
-			"mod-name": "low-on-fire",
-			"author": "Haikis",
-			"author-link": "https://modrinth.com/user/Haikis",
-			"description": "Low fire on your screen! Vanilla Friendly",
-			"icon": "/resources/images/icons/resourcepacks/low-on-fire.webp",
-			"repo-link": "https://modrinth.com/resourcepack/low-on-fire",
-			"download-link": "/resources/resourcepacks/low-on-fire.zip"
-		},
-		{
-			"display-name": "Serified Font",
-			"mod-name": "serified-font",
-			"author": "bebebea_loste",
-			"author-link": "https://modrinth.com/user/bebebea_loste",
-			"description": "My take on a fancier Minecraft typeface",
-			"icon": "/resources/images/icons/resourcepacks/serified-font.webp",
-			"repo-link": "https://modrinth.com/resourcepack/serified-font",
-			"download-link": "/resources/resourcepacks/serified-font.zip"
-		}
-	]
-}
--- a/public/resources/images/icons/clients/1.9.4.webp
+++ b/public/resources/images/icons/clients/1.9.4.webp
--- a/public/resources/images/icons/clients/astra.webp
+++ b/public/resources/images/icons/clients/astra.webp
--- a/public/resources/images/icons/clients/eaglerforge.webp
+++ b/public/resources/images/icons/clients/eaglerforge.webp
--- a/public/resources/images/icons/clients/eaglermobile.webp
+++ b/public/resources/images/icons/clients/eaglermobile.webp
--- a/public/resources/images/icons/clients/eaglerpocketmobile.webp
+++ b/public/resources/images/icons/clients/eaglerpocketmobile.webp
--- a/public/resources/images/icons/clients/resent.webp
+++ b/public/resources/images/icons/clients/resent.webp
--- a/public/resources/images/icons/clients/shadow.webp
+++ b/public/resources/images/icons/clients/shadow.webp
--- a/public/resources/images/icons/clients/starlike.webp
+++ b/public/resources/images/icons/clients/starlike.webp
--- a/public/resources/images/icons/favicon.webp
+++ b/public/resources/images/icons/favicon.webp
--- a/public/resources/images/icons/mods/all.webp
+++ b/public/resources/images/icons/mods/all.webp
--- a/public/resources/images/icons/mods/autoclicker.webp
+++ b/public/resources/images/icons/mods/autoclicker.webp
--- a/public/resources/images/icons/mods/barneysmusicmod.webp
+++ b/public/resources/images/icons/mods/barneysmusicmod.webp
--- a/public/resources/images/icons/mods/blur.webp
+++ b/public/resources/images/icons/mods/blur.webp
--- a/public/resources/images/icons/mods/fullbright.webp
+++ b/public/resources/images/icons/mods/fullbright.webp
--- a/public/resources/images/icons/mods/graplehookmod.webp
+++ b/public/resources/images/icons/mods/graplehookmod.webp
--- a/public/resources/images/icons/mods/jetpack.webp
+++ b/public/resources/images/icons/mods/jetpack.webp
--- a/public/resources/images/icons/mods/speedmod.webp
+++ b/public/resources/images/icons/mods/speedmod.webp
--- a/public/resources/images/icons/mods/statshud.webp
+++ b/public/resources/images/icons/mods/statshud.webp
--- a/public/resources/images/icons/mods/xraymod.webp
+++ b/public/resources/images/icons/mods/xraymod.webp
--- a/public/resources/images/icons/nav/game.webp
+++ b/public/resources/images/icons/nav/game.webp
--- a/public/resources/images/icons/nav/mods.webp
+++ b/public/resources/images/icons/nav/mods.webp
--- a/public/resources/images/icons/nav/servers.webp
+++ b/public/resources/images/icons/nav/servers.webp
--- a/public/resources/images/icons/nav/settings.webp
+++ b/public/resources/images/icons/nav/settings.webp
--- a/public/resources/images/icons/nav/updates.webp
+++ b/public/resources/images/icons/nav/updates.webp
--- a/public/resources/images/icons/resourcepacks/barebones-bossbars.webp
+++ b/public/resources/images/icons/resourcepacks/barebones-bossbars.webp
--- a/public/resources/images/icons/resourcepacks/daggers.webp
+++ b/public/resources/images/icons/resourcepacks/daggers.webp
--- a/public/resources/images/icons/resourcepacks/faithful-32x.webp
+++ b/public/resources/images/icons/resourcepacks/faithful-32x.webp
--- a/public/resources/images/icons/resourcepacks/low-on-fire.webp
+++ b/public/resources/images/icons/resourcepacks/low-on-fire.webp
--- a/public/resources/images/icons/resourcepacks/serified-font.webp
+++ b/public/resources/images/icons/resourcepacks/serified-font.webp
--- a/public/resources/manifest/icons/any/192x192.webp
+++ b/public/resources/manifest/icons/any/192x192.webp
--- a/public/resources/manifest/icons/any/512x512.webp
+++ b/public/resources/manifest/icons/any/512x512.webp
--- a/public/resources/manifest/icons/maskable/2275x2275.webp
+++ b/public/resources/manifest/icons/maskable/2275x2275.webp
--- a/public/resources/manifest/screenshots/home.webp
+++ b/public/resources/manifest/screenshots/home.webp
--- a/public/resources/mods/data.json
+++ b/public/resources/mods/data.json
@ -0,0 +1,183 @@
+{
+	"mods": [
+		{
+			"id": "burmod",
+			"name": "Burmod",
+			"description": "client for eaglerforge (v0.2)",
+			"author": "Murturtle",
+			"authorLink": "https://github.com/Murturtle",
+			"source": "https://github.com/Murturtle/Burmod"
+		},
+		{
+			"id": "statshud",
+			"name": "StatsHud",
+			"description": "An all-new StatsHud, soon to be updated with customization functionality!",
+			"author": "Neverflagastralis",
+			"authorLink": "https://github.com/AstralisLLC",
+			"source": "https://github.com/AstralisLLC/EaglerForge-Mods/blob/main/StatsHudV3.js"
+		},
+		{
+			"id": "fresheaglerui",
+			"name": "FreshEaglerUI",
+			"description": "Makes the UIs slide in and re works the main screen!",
+			"author": "Murturtle",
+			"authorLink": "https://github.com/Murturtle",
+			"source": "https://github.com/Murturtle/MursMods/blob/main/FreshEaglerUI.js"
+		},
+		{
+			"id": "chat-commands-mod",
+			"name": "Chat commands mod",
+			"description": "An open source mod with a built in customizable bug reports system!",
+			"author": "Neverflagastralis",
+			"authorLink": "https://github.com/AstralisLLC",
+			"source": "https://github.com/AstralisLLC/EaglerForge-Mods/blob/main/chat%20utils.js"
+		},
+		{
+			"id": "semiautologin",
+			"name": "SemiAutoLogin",
+			"description": "Press L to login without typing!",
+			"author": "Murturtle",
+			"authorLink": "https://github.com/Murturtle",
+			"source": "https://github.com/Murturtle/MursMods/blob/main/SemiAutoLogin.js"
+		},
+		{
+			"id": "blur",
+			"name": "Blur",
+			"description": "Makes your fps 5 when unfocused!",
+			"author": "Murturtle",
+			"authorLink": "https://github.com/Murturtle",
+			"source": "https://github.com/Murturtle/MursMods/blob/main/Blur.js"
+		},
+		{
+			"id": "jetpack",
+			"name": "Jetpack",
+			"description": "allows you to fly as if you had a jetpack. keybind(hold): h",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/radmanplays/eaglerreborn-plugins/blob/main/jetpack-ef.js"
+		},
+		{
+			"id": "barneys-music-mod",
+			"name": "Barney's Music Mod",
+			"description": "Plays a users music through a direct mp3 link. Saves music through Local Browser storage.",
+			"author": "BarneyTheGod",
+			"authorLink": "https://github.com/BarneyCompiler",
+			"source": "https://github.com/BarneyCompiler/barneysmods/blob/main/Barneys%20Music%20Player"
+		},
+		{
+			"id": "blink",
+			"name": "Blink",
+			"description": "use by typing the .blinkon and .blinkoff commands and sending it",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/radmanplays/eaglerreborn-plugins"
+		},
+		{
+			"id": "grapplehook",
+			"name": "GrappleHook",
+			"description": "grappling hook mod. how to use: 1.grab a fishing rod 2.use the fishing rod 3.grappling hook!",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/radmanplays/eaglerreborn-plugins"
+		},
+		{
+			"id": "xray",
+			"name": "Xray",
+			"description": "simple xray mod. its recommended to use this with Fullbright. keybind: x",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/Xray.js"
+		},
+		{
+			"id": "fullbright",
+			"name": "Fullbright",
+			"description": "full bright mod for eaglerforge. keybind(enabled by default): f",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/fullbright.js"
+		},
+		{
+			"id": "autoclicker",
+			"name": "Autoclicker",
+			"description": "this mod clicks for you",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/autoclicker.js"
+		},
+		{
+			"id": "speed-mod",
+			"name": "Speed Mod",
+			"description": "makes you faster",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/Speed.js"
+		},
+		{
+			"id": "chat-shortcuts",
+			"name": "Chat Shortcuts",
+			"description": "shortcuts: {health}, {pos}, {name}, {me}, {x}, {y}, {z}, {level}, {walked}, {chunk}",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/ChatShortcuts.js"
+		},
+		{
+			"id": "nofall",
+			"name": "NoFall",
+			"description": "makes you not take fall damage",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/NoFall.js"
+		},
+		{
+			"id": "autofish",
+			"name": "AutoFish",
+			"description": "fishes for you. just throw a fishing rod in water to use this mod",
+			"author": "radmanplays",
+			"authorLink": "https://github.com/radmanplays",
+			"source": "https://github.com/EaglerRinth/eaglerrinth.github.io/blob/main/CommunityMods/AutoFish.js"
+		}
+	],
+
+	"resourcepacks": [
+		{
+			"id": "barebones-bossbars",
+			"name": "Barebones Bossbars",
+			"description": "simplistic per-mob icons and colors to decorate boss bars with",
+			"author": "vexcenot",
+			"authorLink": "https://modrinth.com/user/vexcenot",
+			"source": "https://modrinth.com/resourcepack/barebones-bossbars"
+		},
+		{
+			"id": "daggers",
+			"name": "Daggers",
+			"description": "Shorter swords for better visibility.",
+			"author": "devin",
+			"authorLink": "https://modrinth.com/user/devin",
+			"source": "https://modrinth.com/resourcepack/daggers"
+		},
+		{
+			"id": "faithful-32x",
+			"name": "Faithful (32x)",
+			"description": "The original Minecraft texture feel, with double the resolution and double the fun!",
+			"author": "Faithful-Resource-Pack",
+			"authorLink": "https://modrinth.com/user/Faithful-Resource-Pack",
+			"source": "https://modrinth.com/resourcepack/faithful-32x"
+		},
+		{
+			"id": "low-on-fire",
+			"name": "Low On Fire",
+			"description": "Low fire on your screen! Vanilla Friendly",
+			"author": "Haikis",
+			"authorLink": "https://modrinth.com/user/Haikis",
+			"source": "https://modrinth.com/resourcepack/low-on-fire"
+		},
+		{
+			"id": "serified-font",
+			"name": "Serified Font",
+			"description": "My take on a fancier Minecraft typeface",
+			"author": "bebebea_loste",
+			"authorLink": "https://modrinth.com/user/bebebea_loste",
+			"source": "https://modrinth.com/resourcepack/serified-font"
+		}
+	]
+}
--- a/public/resources/mods/downloads/autoclicker.js
+++ b/public/resources/mods/downloads/autoclicker.js
--- a/public/resources/mods/downloads/autofish.js
+++ b/public/resources/mods/downloads/autofish.js
--- a/public/resources/mods/downloads/barebones-bossbars.zip
+++ b/public/resources/mods/downloads/barebones-bossbars.zip
--- a/public/resources/mods/downloads/barneys-music-mod.js
+++ b/public/resources/mods/downloads/barneys-music-mod.js
--- a/public/resources/mods/downloads/blink.js
+++ b/public/resources/mods/downloads/blink.js
--- a/public/resources/mods/downloads/blur.js
+++ b/public/resources/mods/downloads/blur.js
--- a/public/resources/mods/downloads/burmod.js
+++ b/public/resources/mods/downloads/burmod.js
--- a/public/resources/mods/downloads/chat-commands-mod.js
+++ b/public/resources/mods/downloads/chat-commands-mod.js
--- a/public/resources/mods/downloads/chat-shortcuts.js
+++ b/public/resources/mods/downloads/chat-shortcuts.js
--- a/public/resources/mods/downloads/daggers.zip
+++ b/public/resources/mods/downloads/daggers.zip
--- a/public/resources/mods/downloads/faithful-32x.zip
+++ b/public/resources/mods/downloads/faithful-32x.zip
--- a/public/resources/mods/downloads/fresheaglerui.js
+++ b/public/resources/mods/downloads/fresheaglerui.js
--- a/public/resources/mods/downloads/fullbright.js
+++ b/public/resources/mods/downloads/fullbright.js
--- a/public/resources/mods/downloads/grapplehook.js
+++ b/public/resources/mods/downloads/grapplehook.js
--- a/public/resources/mods/downloads/jetpack.js
+++ b/public/resources/mods/downloads/jetpack.js
--- a/public/resources/mods/downloads/low-on-fire.zip
+++ b/public/resources/mods/downloads/low-on-fire.zip
--- a/public/resources/mods/downloads/nofall.js
+++ b/public/resources/mods/downloads/nofall.js
--- a/public/resources/mods/downloads/semiautologin.js
+++ b/public/resources/mods/downloads/semiautologin.js
--- a/public/resources/mods/downloads/serified-font.zip
+++ b/public/resources/mods/downloads/serified-font.zip
--- a/public/resources/mods/downloads/speed-mod.js
+++ b/public/resources/mods/downloads/speed-mod.js
--- a/public/resources/mods/downloads/statshud.js
+++ b/public/resources/mods/downloads/statshud.js
--- a/public/resources/mods/downloads/xray.js
+++ b/public/resources/mods/downloads/xray.js
--- a/public/resources/mods/icons/autoclicker.webp
+++ b/public/resources/mods/icons/autoclicker.webp
--- a/public/resources/mods/icons/autofish.webp
+++ b/public/resources/mods/icons/autofish.webp
--- a/public/resources/mods/icons/barebones-bossbars.webp
+++ b/public/resources/mods/icons/barebones-bossbars.webp
--- a/public/resources/mods/icons/barneys-music-mod.webp
+++ b/public/resources/mods/icons/barneys-music-mod.webp
--- a/public/resources/mods/icons/blink.webp
+++ b/public/resources/mods/icons/blink.webp
--- a/public/resources/mods/icons/blur.webp
+++ b/public/resources/mods/icons/blur.webp
--- a/public/resources/mods/icons/burmod.webp
+++ b/public/resources/mods/icons/burmod.webp
--- a/public/resources/mods/icons/chat-commands-mod.webp
+++ b/public/resources/mods/icons/chat-commands-mod.webp
--- a/public/resources/mods/icons/chat-shortcuts.webp
+++ b/public/resources/mods/icons/chat-shortcuts.webp
--- a/public/resources/mods/icons/daggers.webp
+++ b/public/resources/mods/icons/daggers.webp
--- a/public/resources/mods/icons/faithful-32x.webp
+++ b/public/resources/mods/icons/faithful-32x.webp
--- a/public/resources/mods/icons/fresheaglerui.webp
+++ b/public/resources/mods/icons/fresheaglerui.webp
--- a/public/resources/mods/icons/fullbright.webp
+++ b/public/resources/mods/icons/fullbright.webp
--- a/public/resources/mods/icons/grapplehook.webp
+++ b/public/resources/mods/icons/grapplehook.webp
--- a/public/resources/mods/icons/jetpack.webp
+++ b/public/resources/mods/icons/jetpack.webp
--- a/public/resources/mods/icons/low-on-fire.webp
+++ b/public/resources/mods/icons/low-on-fire.webp
--- a/public/resources/mods/icons/nofall.webp
+++ b/public/resources/mods/icons/nofall.webp
--- a/public/resources/mods/icons/semiautologin.webp
+++ b/public/resources/mods/icons/semiautologin.webp
--- a/public/resources/mods/icons/serified-font.webp
+++ b/public/resources/mods/icons/serified-font.webp
--- a/public/resources/mods/icons/speed-mod.webp
+++ b/public/resources/mods/icons/speed-mod.webp
--- a/public/resources/mods/icons/statshud.webp
+++ b/public/resources/mods/icons/statshud.webp
--- a/public/resources/mods/icons/xray.webp
+++ b/public/resources/mods/icons/xray.webp
--- a/public/resources/styles/themes/default.css
+++ b/public/resources/styles/themes/default.css
@ -611,10 +611,15 @@ nav {
 .settings {
 	display: flex;
 	flex: 1;
+	flex-direction: column;
 	align-items: center;
 	justify-content: center;
 }

+.settings-section {
+	margin: 5px;
+}
+
 #username-input,
 #theme-select {
 	width: calc(100% - 22px);
@ -627,6 +632,11 @@ nav {
 	appearance: none;
 }

+#offline-checkbox {
+	padding: 10px;
+	margin-bottom: 15px;
+}
+
 #username-input:focus,
 #theme-select:focus {
 	outline: none;
--- a/public/servers/index.html
+++ b/public/servers/index.html
@ -13,7 +13,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -33,9 +33,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item" onclick="navigate.mods.mods()">
+						<li class="nav-item" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
--- a/public/settings/index.html
+++ b/public/settings/index.html
@ -14,7 +14,7 @@
 	<body>
 		<div class="launcher">
 			<div class="title-bar">
-				<span>MineXLauncher 1.4</span>
+				<span>MineXLauncher 1.5</span>
 			</div>
 			<div class="content">
 				<div class="sidebar">
@ -34,9 +34,9 @@
 							<img src="/resources/images/icons/nav/servers.webp" class="nav-icon" />
 							<span class="nav-text">Server List</span>
 						</li>
-						<li class="nav-item" onclick="navigate.mods.mods()">
+						<li class="nav-item" onclick="navigate.mods.client()">
 							<img src="/resources/images/icons/nav/mods.webp" class="nav-icon" />
-							<span class="nav-text">Mods</span>
+							<span class="nav-text">Addons</span>
 						</li>
 						<li class="nav-item selected" onclick="navigate.settings()">
 							<img src="/resources/images/icons/nav/settings.webp" class="nav-icon" />
@ -70,6 +70,10 @@
 									<option value="campfire">Campfire</option>
 								</select>
 							</div>
+							<!-- <div class="settings-section">
+								<label for="offline-checkbox">Enable offline use:</label>
+								<input type="checkbox" id="offline-checkbox" />
+							</div> -->
 						</div>
 					</div>
 				</div>
--- a/public/sw-register.js
+++ b/public/sw-register.js
@ -1,7 +0,0 @@
-if ('serviceWorker' in navigator) {
-	window.addEventListener('load', () => {
-		navigator.serviceWorker.register('/service-worker.js').catch((error) => {
-			console.error('Service worker registration failed:', error);
-		});
-	});
-}
--- a/Show More
+++ b/Show More