From 91632214f123adb168be22ec1018d39c9fb1b693 Mon Sep 17 00:00:00 2001 From: zumbiepig <121742281+zumbiepig@users.noreply.github.com> Date: Sat, 7 Sep 2024 08:25:55 -0700 Subject: [PATCH] format with prettier --- .github/workflows/build.yml | 2 + .prettierignore | 3 + .prettierrc.json | 2 +- .vscode/extensions.json | 6 +- .vscode/settings.json | 2 +- build.ts | 8 +- bun.lockb | Bin 113083 -> 113443 bytes package.json | 5 +- server.ts | 6 +- src/404.html | 24 ++- src/articles/index.html | 148 +++++++++++----- src/home/archive/index.html | 84 ++++++--- src/home/clients/index.html | 62 ++++--- src/home/downloads/index.html | 58 +++--- src/home/game/index.html | 62 ++++--- src/index.html | 12 +- src/mobile/index.html | 22 ++- src/mods/mods/index.html | 62 ++++--- src/mods/resourcepacks/index.html | 62 ++++--- src/offline.html | 24 ++- src/offline/index.html | 33 +++- src/resources/data/main.json | 10 +- .../scripts/eagler-launch/1.5.2/main.ts | 14 +- .../eagler-launch/1.8.8/eaglermobile-ef.ts | 166 +++++++++++------- .../eagler-launch/1.8.8/eaglerpocketmobile.ts | 114 ++++++------ src/resources/scripts/main.ts | 54 ++++-- src/resources/styles/themes/campfire.css | 4 +- .../styles/themes/cherry-blossom.css | 4 +- src/resources/styles/themes/default.css | 37 ++-- src/resources/styles/themes/hyperdark.css | 4 +- src/resources/styles/themes/light.css | 98 ++++++----- src/resources/styles/themes/nether.css | 4 +- src/resources/styles/themes/overworld.css | 4 +- src/resources/styles/themes/retro.css | 6 +- src/resources/styles/themes/starfall.css | 4 +- src/resources/styles/themes/the-end.css | 4 +- src/servers/index.html | 62 ++++--- src/settings/index.html | 62 ++++--- src/sw-full.ts | 8 +- src/sw.ts | 10 +- src/updates/index.html | 62 ++++--- src/welcome/index.html | 6 +- 42 files changed, 912 insertions(+), 512 deletions(-) create mode 100644 .prettierignore diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6aa6ea..64fee6e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,8 @@ jobs: uses: oven-sh/setup-bun@v2 - name: Install dependencies run: bun install --frozen-lockfile + - name: Check formatting + run: bun run format:check - name: Lint run: bun run lint - name: Build diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..b741d4f --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +src/game/ +!src/game/web/*.html +src/resources/mods/downloads/ diff --git a/.prettierrc.json b/.prettierrc.json index 8046dbd..655730a 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,5 +1,5 @@ { - "printWidth": 200, + "printWidth": 120, "useTabs": true, "singleQuote": true } diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 8681482..c9cecf2 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,3 @@ { - "recommendations": [ - "oven.bun-vscode", - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode" - ] + "recommendations": ["oven.bun-vscode", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode"] } diff --git a/.vscode/settings.json b/.vscode/settings.json index d3281dd..b64498d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnPaste": true, - "livePreview.serverRoot": "public", + "livePreview.serverRoot": "public" } diff --git a/build.ts b/build.ts index bdcd3d3..35bec60 100644 --- a/build.ts +++ b/build.ts @@ -70,7 +70,7 @@ if (!isDev) { minifyCSS: true, minifyJS: true, continueOnParseError: true, - }) + }), ); }); @@ -84,7 +84,7 @@ if (!isDev) { //optionsPreset: 'medium-obfuscation', target: 'browser', }) - .getObfuscatedCode() + .getObfuscatedCode(), ); }); } @@ -104,8 +104,8 @@ writeFileSync( JSON.stringify( getFiles(publicDir).map((asset) => { return asset.replace(new RegExp(`^${publicDir}`), '').replace(/\/index\.html$/, '/'); - }) - ) + }), + ), ); console.log(chalk.green('Build complete!\n')); diff --git a/bun.lockb b/bun.lockb index c3ae02ada466f968d674d2e9c76e8ff62b38632a..3c394e61ee526431e97683a65f660a763ab022b7 100755 GIT binary patch delta 10321 zcmeHNd0bW1+TQEn5w?jFDjbH(lqeP;gC6JzM>0t|;)Hepp+rPMO%1WDnSwT$soz(v zYg;TbuGPhxmPUjVn&tqGSz2OYdTr9u>RJ{V`906s`y_S!-Ra-Y_2W6udfxS}z1O>j zJuLRtOYPTOZvSL-__)s8TxG1C%q00xCR6W?bNaO}n^{s=T3TFK(hPeKMJX?xHLZ98^0P`yil>xQ3+@aa z4DJTraGP#_349ZDJnUV-GfQR^6waEZSfKr(JA+w2zoevi(p*I;9;o~0fjcUSsXRl5 zdisv~C|OZdxD^!TmlRGfPzp-s&MZYUt|sb-y$ojgmljvG@(YGO1!l9pvg_p^g1bT= zkV`y+%c@d!<#W64HEBjkRAGKW(F@RQbSuhxf|Cd9jg`=ypcjDI86{vevOE#Yv+ub> zKVHZXy?*hmsOkCB6{R=IdDi@b86}WPJz5pY;3{RLm$hu#P$M{lv%&0>=`*4V@@Ew) zMd`XODnwl*cW@&O|1`sY>0P?tHu!W$eSe4E+!f#u=%`_e;sXu?Gdy3N@ zY9_cN_z}5K^|ja_c}}BIzqYBYW}|9v@Ac6={YJlj%jV@Z-*hfYP=B&23i`0zL!R-m zst#mFL$#AtK34NY%&0h-=VLQJgWLca)Wc?aKS}!cOfh%EWK5HJ;Wm*aD~8y`7TGk! zu3m;U1=WSD>S;A4*kn#xikL4e((G!jO;K`DWRju&R<$eUB>u|HGC$mEE=4v$=Jm9h ztC36LdDPF48w3vzdZ-bYv>17)svxWRL8t`T9B4DYid?j;>|qn1%BG=qH5g|f06#^B z_Oz;Fq2hj3i=i;QXk0$ZjzFQcF-EUAA%=lak;mwinod#vch3kFTs`on~AM8rKU>%VJYHunLW&I4#NsalR-Ug zY7uhmYK2`bUXhjzyZIb!V`OER&FsW6bJ?S64RV1!^KdX8R>L4iHMJkbRwQdfMO)1!Py=OiI7Sw^TV;^NCQizVOuO0x&F3-N z$3p}{+#QQ`hzts}soBV(L(rR{W36JntZ>@J zm$J!eS0k`gv4r$_E%Ib`mR(&58=B8m6l67Z9Vt&{rHD*v$+n9XG8?}i$ck*c+6Swc z^GuazhFHZSY00sh8)%c2K{k`eXt^pUMcgHua_nNcw2ZThoiclz-PAr)t{RtOx+7Db z9G4;ga#e1MY8|5}m>KNSAgh=sEqS)|AVpCKGY|$a{Wolut&@D^ z?mWLTfg|*F9q0NSj52hBLO+a;EBzuISd~(Mfy_4iX7jSk7UDkZN@SC~aF1^`*pBM;m4>PiUIF3_F=w)!+_>oy@t`$+|X^A zofl!)!F?fh0}s&0C?I=5_XE=&N4rd(=Ia{ocqkeY4DJu+%DD|p?}03oQ3ZNm+o_P+ zGEIXF@7uxb%QP^L;$Y$L*cW<&VJ9N$E0_NG4 zftkoG{~tqNk9jtUa$YDZ4F6}rtnwUxbk_To22U8)7zJ&arWf%;e#t1m9<%6W{IFrw zh98;PwfJE-tT%WgjYt~>&d&-pFwpjfQE)wG57ZguWY*gZrpb73{0-B-6+f)E-SFE% zBNCbQcMdZOb{U4ixHXGa6`9c&YcLu4!-dyq5M0K z5a=|QAA9d#KSI!(em5Q^IMJ^62*LiLo#ij%hqL$p@uP${`{CC|iJGPv#|Eb^ojN$d zyVEC69JFnpx8kSf)F+=i8Gpz-`+_rl$CYKFk6Yg_j$7UDMAr))zf16Z>`2Se>U$zS z|7B6kfFoyHCj6oK0UseR*7(ZxH4d>)w$wOf^&8$Y?+u4&lxyE`%B)&%>0Rp(2V{1w zQ+mDWE$g8UN%c*q+yr&sn+|bAZiXtV^Oiw%4(u8g*Eyx%CU1EN>OE=Mwd{9?q(muooRk_b0ggghevH|fmIE06+Xh3|8h!4sv(;E>V)cQt; z@RTi3)%y|Oeuq%y+Wm;{0OC8~5I4!}1BmY+;)C**>OsT@b>BgU=qxuw6&*r+ha94- zEIx$z4kJD&A89#^_@L$=c8DIb5o*p6#COCYeC6CDi0>W52W63w?;t*?JUM4$x+1jF5-g;(N~_!ezyKi0>HUgX$&Ik0Cy& z^~W5dw`_r`K92Z~J49s7+T(SdL*4%jI*+|W{xgSHh-QHQ3yH(lq(#P_&V0Igq8#bd z&SXiFeLq`Zo}8>GKD58y{GDKd{PBxz=GjBB_YbSHrpx*7ZBIAHb{N{5>kV&Lky_^n zk<2%vU#{wjX7`IfH`18gnoa2JvbZ({T<rjiKEQEyZm#Ox(UIfH*GRrv?gaR*x(%oYwg~O6ND*P)3%>?! zcBIHOol>;@k;32dXB2Zd`R1Ad3@hCTQHU4w4}4+QY96U7b;0#X%4d!?`N zE*k=IC&1Ca8Q|OTTHvq1E5JHn7w|T~S8=}n^Kq2BiU9zpJ*PQ$(YW!}1?T{D1bA08 z1MLBJx&TZ-E95W0Ph2|Ok^CC?2Dkv62hIS01I_}U0G|P;0X}K`1$YwRKF%zl6qpTg zpJyg;Kfou#slYU#5SRo^28w_JU;>Z^4CSTvXs$EyY21U3L602ebCemB4e;1#J8;8lhnPoN#(0dQaTGQi#2 zFM+Rs7hzupEC>Dw%mL;C4+5Ol3*dt|lyaaH*a%w~&>c{LA7J}CuozeZEG5JK1W>jV zKaTidnt|5*OV0}TK>wh=f490ZO7$AI^McY%q(Nlt(!WKIAaF-{3CpfkW}fTPDL@HOx$a5Hcb z;DX~6;{xNtO98$BZU;UGY`{5yQ;|Nj(Z|hPw1a^`oPeCOEToY=!G&`L;QV9DvD}pj zKt8|`{}JHAp`Dt{%Y}O_n2^5;+b=*Xpg{8y!ecSt9`FKq+3CiG)CJ&#r-9d>n*d&m zxYDS3J#yQ*0-5J(Bon-^^Sb5-@FWE7?rU5S@;o6|GnseU-as#)8|N{dLwGkqIx$hZ zoFF3VLi&prgrECq$o*-8m&xU%)NLOiJ_`=0OhiSj;Kg2Py*%I86loH1(ecs!;8U;d zxLYg~r?gb3u!sxVIH#B#;QoRoXW8nY12_HYxJe9%?ibBvc2#S3iVRcdB<=?!^TL%W7c;r<5anJ(q2@p-QfVM+h!I2>!NwmwT_h=bad zEMWK6E|ov*}~F4W1#+=C%2kcT&>MN2M0tDjZ+w( z=agUkW$SPSu{v5pkx(RPCJ{F-(+bLE}(wL8|_6`GaTU1LJGgWf?8Rolt6{;2^5Bsiaoz z(Q#t3$>(-$X0GU=dE|;9@q!kbiz6ow)&}MZzrZRSsw;*gYhCW&L#K^CrZ*uvHbK#A z#Tm6@+TrMXv=4I8>=r~s#dIjp^6y1N z)3kZ;6Ghrhl*!+reKSG$iOE{*cofdm9H0RA$2yyCDP7d@wUB#FqOU$5 zl@(eU{d9Me?=Wp-KIT!_FzxVowAKAp(A1NcPAqMm{J+=g?a)L%PG?jIbblqJ&KS7& z{HRr1O=7`-=-8y_IOTVT40L}lw6><(rkzK^CS5zE`&g@oyPo^X*XE2`()H6HadQ zWzNIjp6&I#BA>;atMH*&9xMbhgSv!#oQyG%^~ za4WPA^h;C6EuC~{YTyauSWCCmJv~u$PweQvjzt$tnWdeXBmyjMOH5RZI~x^`i&uQz K^UsN(p#K9wTC9%% delta 10285 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 diff --git a/package.json b/package.json index bcbde31..8a36e96 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,9 @@ "lint": "eslint ./src/resources/scripts/ && tsc", "lint:fix": "eslint --fix ./src/resources/scripts/ && tsc", "build": "NODE_ENV=production bun run ./build.ts", - "build:dev": "NODE_ENV=development bun run ./build.ts" + "build:dev": "NODE_ENV=development bun run ./build.ts", + "format": "prettier --write .", + "format:check": "prettier --check ." }, "dependencies": { "chalk": "^5.3.0", @@ -39,6 +41,7 @@ "eslint": "^9.9.1", "html-minifier": "^4.0.0", "javascript-obfuscator": "^4.1.1", + "prettier": "^3.3.3", "typescript-eslint": "^8.4.0" }, "peerDependencies": { diff --git a/server.ts b/server.ts index c13b916..309bdc8 100644 --- a/server.ts +++ b/server.ts @@ -28,7 +28,7 @@ debugLogger('Booting server.'); app.use( helmet({ contentSecurityPolicy: false, - }) + }), ); app.use(morgan(isDev ? 'dev' : 'combined')); @@ -64,7 +64,9 @@ app }) .on('error', (error) => { if (error.code === 'EADDRINUSE') { - console.error(chalk.red('EADDRINUSE') + chalk.gray(': ') + chalk.bold(`Failed to start server. Is port ${PORT} in use?`)); + console.error( + chalk.red('EADDRINUSE') + chalk.gray(': ') + chalk.bold(`Failed to start server. Is port ${PORT} in use?`), + ); process.exit(1); } }); diff --git a/src/404.html b/src/404.html index fe0a593..db21670 100644 --- a/src/404.html +++ b/src/404.html @@ -1,4 +1,4 @@ - + @@ -13,7 +13,14 @@
- +
@@ -31,7 +38,9 @@
- Join the MineXLauncher Discord + Join the MineXLauncher Discord
© 2024 MineXLauncher. All rights reserved. @@ -39,7 +48,14 @@
- +
diff --git a/src/articles/index.html b/src/articles/index.html index fde1739..f2b0b6e 100644 --- a/src/articles/index.html +++ b/src/articles/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
- +
@@ -21,32 +28,32 @@
- +
@@ -60,14 +67,22 @@
How To Make An Eaglercraft Server -

Have you ever wondered how to make an Eaglercraft Server? Read this article to find out how!

+

+ Have you ever wondered how to make an Eaglercraft Server? Read this article to find out how! +

- +
Setting Up a Cloudflare Tunnel for an Eaglercraft Server -

This brief guide walks you through configuring a Cloudflare Tunnel for your Eaglercraft server.

+

+ This brief guide walks you through configuring a Cloudflare Tunnel for your Eaglercraft server. +

@@ -76,7 +91,9 @@
- Join the MineXLauncher Discord + Join the MineXLauncher Discord
© 2024 MineXLauncher. All rights reserved. @@ -84,7 +101,14 @@
- +
@@ -96,16 +120,27 @@

Prerequisites

  • A server/computer with stable internet access and decent bandwidth
    • -
  • Java 17 installed (Get it from here)
    • +
  • + Java 17 installed (Get it from + here) +
  • Basic knowledge of your OS's command-line/terminal
  • Access to your network router (for port forwarding)

Step 1: Set Up Bungee

    -
  1. Download the latest version of Bungee from here.
    2. +
  2. + Download the latest version of Bungee from + here. +
  3. Create a new directory for your server and place the Bungee JAR file in it
  4. - Create a start script (e.g., start.bat for Windows or start.sh for Linux) with the following content: + Create a start script (e.g., start.bat for Windows or start.sh for Linux) with the + following content: 
    java -Xms512M -Xmx512M -jar bungee.jar
  5. Run the start script to generate configuration files, then stop the server
    6. @@ -116,18 +151,30 @@
  6. Download a compatible Minecraft server JAR (e.g., Paper)
  7. Set up the backend server in a separate directory
  8. - Create a start script (e.g., start.bat for Windows or start.sh for Linux) with the following content: + Create a start script (e.g., start.bat for Windows or start.sh for Linux) with the + following content: 
    java -Xms1024M -Xmx1024M -jar server.jar
  9. Configure server.properties (Disable online mode, change the port, etc.)
  10. Configure spigot.yml to have this: bungeecord: true
    11. -
  11. If your server is on a different version than 1.8.8, you need to download the ViaVersion plugins.
    12. -
  12. Add the backend server to your Bungee config.yml by scrolling to the servers section and editing/adding an entry for your server, such as localhost:port.
    13. +
  13. + If your server is on a different version than 1.8.8, you need to download the + ViaVersion plugins. +
    14. +
  14. + Add the backend server to your Bungee config.yml by scrolling to the servers section and + editing/adding an entry for your server, such as localhost:port. +

Step 3: Install EaglerXBungee Plugin

  1. - Download the EaglerXBungee plugin from here. + Download the EaglerXBungee plugin from + here.
  2. Place the downloaded JAR file in the Bungee server's plugins folder
  3. Restart the Bungee server to generate the plugin's configuration files
    4. @@ -144,7 +191,10 @@

    Step 5: Port Forwarding

    1. Access your router's admin panel
      2. -
    2. Set up port forwarding for port 8081 (or whichever port you configured for EaglerXBungee) to your server's local IP address
      3. +
    3. + Set up port forwarding for port 8081 (or whichever port you configured for EaglerXBungee) to + your server's local IP address +

    Step 6: Domain Configuration (Optional)

    If you want to use a custom domain:

    @@ -158,12 +208,18 @@
  4. Restart Caddy to apply these changes, using caddy stop and caddy start.

Step 7: Connecting to Your Server

-

Players can connect to your server using an Eaglercraft client such as MineXLauncher, and entering your server's IP address or domain and port.

+

+ Players can connect to your server using an Eaglercraft client such as MineXLauncher, and entering your + server's IP address or domain and port. +

Examples:

  • wss://localhost
  • wss://example.com

    • Security Considerations

    -

    Ensure you keep all software (especially the EaglerXBungee plugin) up to date and properly secure your server to protect against potential vulnerabilities.

    +

    + Ensure you keep all software (especially the EaglerXBungee plugin) up to date and properly secure your server + to protect against potential vulnerabilities. +

    @@ -171,7 +227,10 @@ ×

    Setting Up a Cloudflare Tunnel for an Eaglercraft Server

    Written by zumbiepig and SpeedSlicer
    -

    In this guide, we'll walk you through the steps to set up a Cloudflare Tunnel for your Eaglercraft server, which is running on ws://localhost:8081.

    +

    + In this guide, we'll walk you through the steps to set up a Cloudflare Tunnel for your Eaglercraft server, + which is running on ws://localhost:8081. +

    Prerequisites

    • An Eaglercraft server running on ws://localhost:8081
      • @@ -180,7 +239,10 @@

    Step 1: Access Cloudflare Tunnels

      -
    1. Go to the Dashboard and log in to your Cloudflare account.
      2. +
    2. + Go to the Dashboard and log in to your Cloudflare + account. +
    3. Navigate to the Zero Trust page using the navigation bar on the left.
    4. Sign up for Cloudflare Zero Trust with the Free Plan if you have not already.
    5. Once you are in the dashboard, navigate to Networks > Tunnels.
      6. @@ -190,7 +252,10 @@
    6. Click on Create a tunnel, and select Cloudflared.
    7. Click Next.
    8. Enter a name for the tunnel.
      9. -
    9. Follow the instructions provided on the site to install the tunnel.
      You should do these instructions on the computer that your Eaglercraft server is running on.
      10. +
    10. + Follow the instructions provided on the site to install the tunnel.
      You should do these instructions on + the computer that your Eaglercraft server is running on. +

    Step 3: Configure Domain/Subdomain

      @@ -202,7 +267,10 @@
      1. Start your Eaglercraft server.
      2. In Eaglercraft, connect to the domain or subdomain you set up.
        3. -
      3. You're all set! Players can now join your server using the domain that you linked your tunnel to.
        Example: wss://example.com
        4. +
      4. + You're all set! Players can now join your server using the domain that you linked your tunnel to.
        Example: + wss://example.com +
    diff --git a/src/home/archive/index.html b/src/home/archive/index.html index 950e609..94105ec 100644 --- a/src/home/archive/index.html +++ b/src/home/archive/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -183,7 +190,6 @@ - @@ -205,15 +211,32 @@
    - - - + + +
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -221,7 +244,14 @@
    - +
    diff --git a/src/home/clients/index.html b/src/home/clients/index.html index 0b4f54a..91058fd 100644 --- a/src/home/clients/index.html +++ b/src/home/clients/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -98,7 +105,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -106,7 +115,14 @@
    - +
    diff --git a/src/home/downloads/index.html b/src/home/downloads/index.html index 67ac0a1..1ea645c 100644 --- a/src/home/downloads/index.html +++ b/src/home/downloads/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -90,7 +97,14 @@
    - +
    diff --git a/src/home/game/index.html b/src/home/game/index.html index 88ee615..5e8bf2e 100644 --- a/src/home/game/index.html +++ b/src/home/game/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -118,7 +125,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -126,7 +135,14 @@
    - +
    diff --git a/src/index.html b/src/index.html index e570c26..f94cfbf 100644 --- a/src/index.html +++ b/src/index.html @@ -1,4 +1,4 @@ - + @@ -9,7 +9,10 @@ - + - + diff --git a/src/mobile/index.html b/src/mobile/index.html index 6e987df..3bd2655 100644 --- a/src/mobile/index.html +++ b/src/mobile/index.html @@ -1,4 +1,4 @@ - + @@ -18,12 +18,12 @@
    - +
    @@ -37,14 +37,22 @@
    - Download Offline + Download Offline
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. diff --git a/src/mods/mods/index.html b/src/mods/mods/index.html index 8e49715..b37fad2 100644 --- a/src/mods/mods/index.html +++ b/src/mods/mods/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -67,7 +74,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -75,7 +84,14 @@
    - +
    diff --git a/src/mods/resourcepacks/index.html b/src/mods/resourcepacks/index.html index e15aa52..6d3b19a 100644 --- a/src/mods/resourcepacks/index.html +++ b/src/mods/resourcepacks/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -64,7 +71,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -72,7 +81,14 @@
    - +
    diff --git a/src/offline.html b/src/offline.html index 2ff3bb5..7e61d87 100644 --- a/src/offline.html +++ b/src/offline.html @@ -1,4 +1,4 @@ - + @@ -13,7 +13,14 @@
    - +
    @@ -31,7 +38,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -39,7 +48,14 @@
    - +
    diff --git a/src/offline/index.html b/src/offline/index.html index c8164a6..b77ae41 100644 --- a/src/offline/index.html +++ b/src/offline/index.html @@ -1,4 +1,4 @@ - + @@ -19,12 +19,12 @@
    - +
    @@ -61,11 +61,17 @@ 1.2.5
    -
    +
    Beta 1.7.3
    -
    +
    Beta 1.3
    @@ -86,7 +92,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -94,7 +102,14 @@
    - +
    diff --git a/src/resources/data/main.json b/src/resources/data/main.json index 354926f..33d1a8c 100644 --- a/src/resources/data/main.json +++ b/src/resources/data/main.json @@ -44,11 +44,17 @@ "updates": [ { "version": "1.6.1", - "changelog": ["Eaglercraft 1.9 has been updated to v0.7.0", "Tutorials have been added to the launcher, go check them out!"] + "changelog": [ + "Eaglercraft 1.9 has been updated to v0.7.0", + "Tutorials have been added to the launcher, go check them out!" + ] }, { "version": "1.6", - "changelog": ["You can now install mods directly from the mods list", "Bugfix: Themes no longer flicker when navigating"] + "changelog": [ + "You can now install mods directly from the mods list", + "Bugfix: Themes no longer flicker when navigating" + ] }, { "version": "1.5", 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 49b42e0..2011b8a 100644 --- a/src/resources/scripts/eagler-launch/1.5.2/main.ts +++ b/src/resources/scripts/eagler-launch/1.5.2/main.ts @@ -14,7 +14,19 @@ window.addEventListener('load', function () { { 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!'], + splashes: [ + 'Darviglet!', + 'eaglerenophile!', + 'You Eagler!', + 'Yeeeeeee!', + 'yeee', + 'EEEEEEEEE!', + 'You Darvig!', + 'You Vigg!', + ':>', + '|>', + 'You Yumpster!', + ], eaglerLogo: false, }, }; diff --git a/src/resources/scripts/eagler-launch/1.8.8/eaglermobile-ef.ts b/src/resources/scripts/eagler-launch/1.8.8/eaglermobile-ef.ts index deb8218..f8787f6 100644 --- a/src/resources/scripts/eagler-launch/1.8.8/eaglermobile-ef.ts +++ b/src/resources/scripts/eagler-launch/1.8.8/eaglermobile-ef.ts @@ -2,7 +2,10 @@ // @ts-nocheck if (new URLSearchParams(window.location.search).get('mobile') === 'true') { try { - unsafeWindow.console.warn("DANGER: This userscript is using unsafeWindow. Unsafe websites could potentially use this to gain access to data and other content that the browser normally wouldn't allow!"), Object.defineProperty(window, 'clientWindow', { value: unsafeWindow }); + unsafeWindow.console.warn( + "DANGER: This userscript is using unsafeWindow. Unsafe websites could potentially use this to gain access to data and other content that the browser normally wouldn't allow!", + ), + Object.defineProperty(window, 'clientWindow', { value: unsafeWindow }); } catch { Object.defineProperty(window, 'clientWindow', { value: window }); } @@ -135,8 +138,8 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (...A) { if (A[0].isValid || !clientWindow.keyboardFix) return I.apply(this, A); }, - ...g - ) + ...g, + ) : i.call(this, A, I, ...g); }, }); @@ -206,7 +209,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { (g.hidden = !0), (g.style.display = 'none'); }, - { passive: !1, once: !0 } + { passive: !1, once: !0 }, ), clientWindow.addEventListener( 'focus', @@ -215,7 +218,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { (g.hidden = !0), (g.style.display = 'none'); }, 300); }, - { once: !0 } + { once: !0 }, ), document.body.appendChild(g)), g @@ -235,7 +238,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { A.preventDefault(); }, - !1 + !1, ), i.addEventListener('contextmenu', function (A) { A.preventDefault(); @@ -263,17 +266,19 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { g.preventDefault(); const e = g.targetTouches[0]; A || ((A = e.pageX), (I = e.pageY)), (g.movementX = e.pageX - A), (g.movementY = e.pageY - I); - var C = clientWindow.fakelock ? new MouseEvent('mousemove', { movementX: g.movementX, movementY: g.movementY }) : new WheelEvent('wheel', { wheelDeltaY: g.movementY }); + var C = clientWindow.fakelock + ? new MouseEvent('mousemove', { movementX: g.movementX, movementY: g.movementY }) + : new WheelEvent('wheel', { wheelDeltaY: g.movementY }); i.dispatchEvent(C), (A = e.pageX), (I = e.pageY); }, - !1 + !1, ), i.addEventListener( 'touchend', function (g) { (A = null), (I = null); }, - !1 + !1, ), d(null != clientWindow.fakelock); let e = Z('strafeRightButton', 'inGame', 'div'); @@ -287,7 +292,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('w', 'keydown'), e.classList.remove('hide'), c.classList.remove('hide'), n.classList.add('active'); }, - !1 + !1, ), n.addEventListener( 'touchmove', @@ -296,16 +301,28 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { const I = A.targetTouches[0]; g || (g = I.pageX); let i = I.pageX - g; - 10 * i > clientWindow.innerHeight ? (e.classList.add('active'), c.classList.remove('active'), C('d', 'keydown'), C('a', 'keyup')) : 10 * i < 0 - clientWindow.innerHeight ? (c.classList.add('active'), e.classList.remove('active'), C('a', 'keydown'), C('d', 'keyup')) : (e.classList.remove('active'), c.classList.remove('active')); + 10 * i > clientWindow.innerHeight + ? (e.classList.add('active'), c.classList.remove('active'), C('d', 'keydown'), C('a', 'keyup')) + : 10 * i < 0 - clientWindow.innerHeight + ? (c.classList.add('active'), e.classList.remove('active'), C('a', 'keydown'), C('d', 'keyup')) + : (e.classList.remove('active'), c.classList.remove('active')); }, - !1 + !1, ), n.addEventListener( 'touchend', function (A) { - C('w', 'keyup'), C('d', 'keyup'), C('a', 'keyup'), e.classList.remove('active'), c.classList.remove('active'), e.classList.add('hide'), c.classList.add('hide'), n.classList.remove('active'), (g = null); + C('w', 'keyup'), + C('d', 'keyup'), + C('a', 'keyup'), + e.classList.remove('active'), + c.classList.remove('active'), + e.classList.add('hide'), + c.classList.add('hide'), + n.classList.remove('active'), + (g = null); }, - !1 + !1, ), e.classList.add('hide'), c.classList.add('hide'), @@ -317,14 +334,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('d', 'keydown'); }, - !1 + !1, ), o.addEventListener( 'touchend', function (A) { C('d', 'keyup'); }, - !1 + !1, ), document.body.appendChild(o); let l = Z('leftButton', 'inGame'); @@ -334,14 +351,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('a', 'keydown'); }, - !1 + !1, ), l.addEventListener( 'touchend', function (A) { C('a', 'keyup'); }, - !1 + !1, ), document.body.appendChild(l); let b = Z('backButton', 'inGame'); @@ -351,14 +368,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('s', 'keydown'); }, - !1 + !1, ), b.addEventListener( 'touchend', function (A) { C('s', 'keyup'); }, - !1 + !1, ), document.body.appendChild(b); let w = Z('jumpButton', 'inGame'); @@ -368,14 +385,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C(' ', 'keydown'); }, - !1 + !1, ), w.addEventListener( 'touchend', function (A) { C(' ', 'keyup'); }, - !1 + !1, ), document.body.appendChild(w); let M = Z('crouchButton', 'inGame'); @@ -389,14 +406,16 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { (clientWindow.crouchLock = null != clientWindow.crouchLock), M.classList.toggle('active'); }, 1e3)); }, - !1 + !1, ), M.addEventListener( 'touchend', function (A) { - clientWindow.crouchLock || (C('shift', 'keyup'), M.classList.remove('active'), (clientWindow.crouchLock = !1)), clearTimeout(clientWindow.crouchTimer); + clientWindow.crouchLock || + (C('shift', 'keyup'), M.classList.remove('active'), (clientWindow.crouchLock = !1)), + clearTimeout(clientWindow.crouchTimer); }, - !1 + !1, ), document.body.appendChild(M); let v = Z('inventoryButton', 'inGame'); @@ -406,14 +425,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('e', 'keydown'); }, - !1 + !1, ), v.addEventListener( 'touchend', function (A) { C('e', 'keyup'); }, - !1 + !1, ), document.body.appendChild(v); let m = Z('exitButton', 'inMenu'); @@ -423,53 +442,71 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('`', 'keydown'); }, - !1 + !1, ), m.addEventListener( 'touchend', function (A) { C('`', 'keyup'); }, - !1 + !1, ), document.body.appendChild(m); let h = document.createElement('input', !0); (h.id = 'hiddenInput'), h.classList.add('inMenu'), - (h.style.cssText = 'position:absolute;top: 0vh; margin: auto; left: 8vh; right:0vh; width: 8vh; height: 8vh;font-size:20px;z-index: -10;color: transparent;text-shadow: 0 0 0 black;'), + (h.style.cssText = + 'position:absolute;top: 0vh; margin: auto; left: 8vh; right:0vh; width: 8vh; height: 8vh;font-size:20px;z-index: -10;color: transparent;text-shadow: 0 0 0 black;'), h.addEventListener( 'beforeinput', function (A) { A.stopImmediatePropagation(), A.preventDefault(!0); let I = 'insertLineBreak' == A.inputType ? 'return' : null == A.data ? 'delete' : A.data.slice(-1); - if ((clientWindow.lastKey || (clientWindow.console.warn('Enabling blocking duplicate key events. Some functionality may be lost.'), (clientWindow.inputFix = !0)), clientWindow.keyboardFix)) + if ( + (clientWindow.lastKey || + (clientWindow.console.warn('Enabling blocking duplicate key events. Some functionality may be lost.'), + (clientWindow.inputFix = !0)), + clientWindow.keyboardFix) + ) if ('insertLineBreak' == A.inputType) C('enter', 'keydown'), C('enter', 'keyup'); else { const g = A.inputType.slice(0, 1); if ('i' == g && A.data) { - if (clientWindow.lastKey == I && clientWindow.blockNextInput && clientWindow.inputFix) clientWindow.blockNextInput = !1; + if (clientWindow.lastKey == I && clientWindow.blockNextInput && clientWindow.inputFix) + clientWindow.blockNextInput = !1; else { - I.toLowerCase() != I ? (C('shift', 'keydown'), C(I, 'keydown'), C(I, 'keyup'), C('shift', 'keyup')) : (C(I, 'keydown'), C(I, 'keyup')), (clientWindow.blockNextInput = !0); + I.toLowerCase() != I + ? (C('shift', 'keydown'), C(I, 'keydown'), C(I, 'keyup'), C('shift', 'keyup')) + : (C(I, 'keydown'), C(I, 'keyup')), + (clientWindow.blockNextInput = !0); } - } else ('d' != g && A.data) || (C('backspace', 'keydown'), C('backspace', 'keyup'), (clientWindow.blockNextInput = !1)); + } else + ('d' != g && A.data) || + (C('backspace', 'keydown'), C('backspace', 'keyup'), (clientWindow.blockNextInput = !1)); } (clientWindow.lastKey = I), (h.value = ' '); }, - !1 + !1, ), h.addEventListener( 'input', function (A) { ' ' != h.value && (h.value = ' '); }, - !1 + !1, ), h.addEventListener( 'keydown', function (A) { - (229 != A.keyCode && 229 != A.which) || clientWindow.keyboardFix || (clientWindow.console.warn('Switching from keydown to input events due to invalid KeyboardEvent. Some functionality will be lost.'), (clientWindow.keyboardFix = !0), clientWindow.lastKey && (C(clientWindow.lastKey, 'keydown'), C(clientWindow.lastKey, 'keyup'))); + (229 != A.keyCode && 229 != A.which) || + clientWindow.keyboardFix || + (clientWindow.console.warn( + 'Switching from keydown to input events due to invalid KeyboardEvent. Some functionality will be lost.', + ), + (clientWindow.keyboardFix = !0), + clientWindow.lastKey && (C(clientWindow.lastKey, 'keydown'), C(clientWindow.lastKey, 'keyup'))); }, - !1 + !1, ), h.addEventListener('blur', function (A) { clientWindow.hiddenInputFocused = !1; @@ -482,14 +519,15 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { A.preventDefault(); }, - !1 + !1, ), a.addEventListener( 'touchend', function (A) { - A.preventDefault(), clientWindow.hiddenInputFocused ? h.blur() : (h.select(), (clientWindow.hiddenInputFocused = !0)); + A.preventDefault(), + clientWindow.hiddenInputFocused ? h.blur() : (h.select(), (clientWindow.hiddenInputFocused = !0)); }, - !1 + !1, ), document.body.appendChild(a); let p = Z('placeButton', 'inGame'); @@ -499,14 +537,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { t(2, 'mousedown', i); }, - !1 + !1, ), p.addEventListener( 'touchend', function (A) { t(2, 'mouseup', i); }, - !1 + !1, ), document.body.appendChild(p); let R = Z('breakButton', 'inGame'); @@ -516,14 +554,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { t(0, 'mousedown', i); }, - !1 + !1, ), R.addEventListener( 'touchend', function (A) { t(0, 'mouseup', i); }, - !1 + !1, ), document.body.appendChild(R); let W = Z('selectButton', 'inGame'); @@ -533,14 +571,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { t(1, 'mousedown', i); }, - !1 + !1, ), W.addEventListener( 'touchend', function (A) { t(1, 'mouseup', i); }, - !1 + !1, ), document.body.appendChild(W); let u = Z('scrollUpButton', 'inGame'); @@ -550,7 +588,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { G(i, -10); }, - !1 + !1, ), document.body.appendChild(u); let Y = Z('scrollDownButton', 'inGame'); @@ -560,7 +598,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { G(i, 10); }, - !1 + !1, ), document.body.appendChild(Y); let S = Z('throwButton', 'inGame'); @@ -570,14 +608,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('q', 'keydown'); }, - !1 + !1, ), S.addEventListener( 'touchend', function (A) { C('q', 'keyup'); }, - !1 + !1, ), document.body.appendChild(S); let j = Z('sprintButton', 'inGame'); @@ -591,14 +629,16 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { (clientWindow.sprintLock = null != clientWindow.sprintLock), j.classList.toggle('active'); }, 1e3)); }, - !1 + !1, ), j.addEventListener( 'touchend', function (A) { - clientWindow.sprintLock || (C('r', 'keyup'), j.classList.remove('active'), (clientWindow.sprintLock = !1)), clearTimeout(clientWindow.sprintTimer); + clientWindow.sprintLock || + (C('r', 'keyup'), j.classList.remove('active'), (clientWindow.sprintLock = !1)), + clearTimeout(clientWindow.sprintTimer); }, - !1 + !1, ), document.body.appendChild(j); let y = Z('pauseButton', 'inGame'); @@ -608,14 +648,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('`', 'keydown'); }, - !1 + !1, ), y.addEventListener( 'touchend', function (A) { C('`', 'keyup'); }, - !1 + !1, ), document.body.appendChild(y); let L = Z('chatButton', 'inGame'); @@ -625,7 +665,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('t', 'keydown'); }, - !1 + !1, ), document.body.appendChild(L); let N = Z('perspectiveButton', 'inGame'); @@ -635,14 +675,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('f', 'keydown'), C('5', 'keydown'); }, - !1 + !1, ), N.addEventListener( 'touchend', function (A) { C('f', 'keyup'), C('5', 'keyup'); }, - !1 + !1, ), document.body.appendChild(N); let U = Z('screenshotButton', 'inGame'); @@ -652,14 +692,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('f', 'keydown'), C('2', 'keydown'); }, - !1 + !1, ), U.addEventListener( 'touchend', function (A) { C('f', 'keyup'), C('2', 'keyup'); }, - !1 + !1, ), document.body.appendChild(U); let z = Z('coordinatesButton', 'inGame'); @@ -669,14 +709,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (A) { C('f', 'keydown'), C('3', 'keydown'); }, - !1 + !1, ), z.addEventListener( 'touchend', function (A) { C('f', 'keyup'), C('3', 'keyup'); }, - !1 + !1, ), document.body.appendChild(z); })(); diff --git a/src/resources/scripts/eagler-launch/1.8.8/eaglerpocketmobile.ts b/src/resources/scripts/eagler-launch/1.8.8/eaglerpocketmobile.ts index 7eed39a..190eacf 100644 --- a/src/resources/scripts/eagler-launch/1.8.8/eaglerpocketmobile.ts +++ b/src/resources/scripts/eagler-launch/1.8.8/eaglerpocketmobile.ts @@ -160,7 +160,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { } return fn.apply(this, args); // Appends the rest of the function specified by addEventListener }, - ...rest + ...rest, ); } else { // If it's not a keydown event, behave like normal (hopefully) @@ -200,14 +200,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { clientY: event.clientY, screenX: event.screenX, screenY: event.screenY, - }) + }), ); } function wheelEvent(element, delta) { element.dispatchEvent( new WheelEvent('wheel', { wheelDeltaY: delta, - }) + }), ); } function setButtonVisibility(pointerLocked) { @@ -285,7 +285,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { element.hidden = true; element.style.display = 'none'; }, - { passive: false, once: true } + { passive: false, once: true }, ); window.addEventListener( 'focus', @@ -295,7 +295,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { element.style.display = 'none'; }, 300); }, - { once: true } + { once: true }, ); document.body.appendChild(element); } @@ -347,7 +347,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { e.preventDefault(); }, - false + false, ); touchButton.addEventListener('contextmenu', function (e) { e.preventDefault(); @@ -393,7 +393,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { } } }, - false + false, ); canvas.addEventListener( @@ -411,7 +411,8 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { if (primaryTouch) { primaryTouch.distanceX = primaryTouch.clientX - canvasTouchStartX; primaryTouch.distanceY = primaryTouch.clientY - canvasTouchStartY; - primaryTouch.squaredNorm = primaryTouch.distanceX * primaryTouch.distanceX + primaryTouch.distanceY * primaryTouch.distanceY; + primaryTouch.squaredNorm = + primaryTouch.distanceX * primaryTouch.distanceX + primaryTouch.distanceY * primaryTouch.distanceY; primaryTouch.movementX = primaryTouch.clientX - canvasTouchPreviousX; primaryTouch.movementY = primaryTouch.clientY - canvasTouchPreviousY; if (window.canvasTouchMode == 1) { @@ -439,7 +440,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { screenY: primaryTouch.screenY, // The top four are used for item position when in GUI's, the bottom two are for moving the camera inGame movementX: primaryTouch.movementX, movementY: primaryTouch.movementY, - }) + }), ); } } @@ -447,7 +448,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { canvasTouchPreviousY = primaryTouch.clientY; } }, - false + false, ); function canvasTouchEnd(e) { @@ -495,7 +496,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { strafeLeftButton.classList.remove('hide'); forwardButton.classList.add('active'); }, - false + false, ); forwardButton.addEventListener( 'touchmove', @@ -523,7 +524,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { strafeLeftButton.classList.remove('active'); } }, - false + false, ); forwardButton.addEventListener( 'touchend', @@ -539,7 +540,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { buttonTouchStartX = null; }, - false + false, ); strafeRightButton.classList.add('hide'); strafeLeftButton.classList.add('hide'); @@ -552,14 +553,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent('d', 'keydown'); }, - false + false, ); rightButton.addEventListener( 'touchend', function (e) { keyEvent('d', 'keyup'); }, - false + false, ); document.body.appendChild(rightButton); const leftButton = createTouchButton('leftButton', 'inGame'); @@ -569,14 +570,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent('a', 'keydown'); }, - false + false, ); leftButton.addEventListener( 'touchend', function (e) { keyEvent('a', 'keyup'); }, - false + false, ); document.body.appendChild(leftButton); const backButton = createTouchButton('backButton', 'inGame'); @@ -586,14 +587,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent('s', 'keydown'); }, - false + false, ); backButton.addEventListener( 'touchend', function (e) { keyEvent('s', 'keyup'); }, - false + false, ); document.body.appendChild(backButton); const jumpButton = createTouchButton('jumpButton', 'inGame'); @@ -603,14 +604,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent(' ', 'keydown'); }, - false + false, ); jumpButton.addEventListener( 'touchend', function (e) { keyEvent(' ', 'keyup'); }, - false + false, ); document.body.appendChild(jumpButton); @@ -627,7 +628,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { crouchButton.classList.toggle('active'); }, 1000); }, - false + false, ); crouchButton.addEventListener( @@ -640,7 +641,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { } clearTimeout(window.crouchTimer); }, - false + false, ); document.body.appendChild(crouchButton); const inventoryButton = createTouchButton('inventoryButton', 'inGame'); @@ -651,7 +652,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent('e', 'keydown'); }, - false + false, ); inventoryButton.addEventListener( 'touchend', @@ -660,7 +661,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { keyEvent('shift', 'keyup'); // Sometimes shift gets stuck on, which interferes with item manipulation in GUI's keyEvent('e', 'keyup'); }, - false + false, ); document.body.appendChild(inventoryButton); const exitButton = createTouchButton('exitButton', 'inMenu'); @@ -671,14 +672,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent('`', 'keydown'); }, - false + false, ); exitButton.addEventListener( 'touchend', function (e) { keyEvent('`', 'keyup'); }, - false + false, ); document.body.appendChild(exitButton); // ---Input Handling--- @@ -703,7 +704,8 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { const hiddenInput = document.createElement('input', true); hiddenInput.id = 'hiddenInput'; hiddenInput.classList.add('inMenu'); - hiddenInput.style.cssText = 'position:absolute;top: 0vh; margin: auto; left: 8vh; right:0vh; width: 8vh; height: 8vh;font-size:20px;z-index: -10;color: transparent;text-shadow: 0 0 0 black;'; // We hide the input behind a key because display: none and opacity:0 causes issues + hiddenInput.style.cssText = + 'position:absolute;top: 0vh; margin: auto; left: 8vh; right:0vh; width: 8vh; height: 8vh;font-size:20px;z-index: -10;color: transparent;text-shadow: 0 0 0 black;'; // We hide the input behind a key because display: none and opacity:0 causes issues hiddenInput.addEventListener( 'beforeinput', function (e) { @@ -753,7 +755,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { window.lastKey = inputData; // Saves the last key pressed hiddenInput.value = ' '; //This previously allowed us to have a character to delete, but beforeinput doesn't require this. This does allow us to check wether Duplicate Mode is necessary though }, - false + false, ); hiddenInput.addEventListener( 'input', @@ -764,14 +766,16 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { hiddenInput.value = ' '; } }, - false + false, ); hiddenInput.addEventListener( 'keydown', function (e) { // Enables Compatibility Mode if we receive an invalid key press event if ((e.keyCode == 229 || e.which == 229) && !window.keyboardFix) { - window.console.warn('Switching from keydown to input events due to invalid KeyboardEvent. Some functionality will be lost.'); + window.console.warn( + 'Switching from keydown to input events due to invalid KeyboardEvent. Some functionality will be lost.', + ); window.keyboardFix = true; if (window.lastKey) { // Resend the last saved key press (which is being tracked by the beforeinput event listener) so the transition to Compatibility Mode isn't noticeable @@ -780,7 +784,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { } } }, - false + false, ); hiddenInput.addEventListener('blur', function (e) { // Updates window.hiddenInputFocused to reflect the actual state of the focus @@ -795,7 +799,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { e.preventDefault(); }, - false + false, ); keyboardButton.addEventListener( 'touchend', @@ -808,7 +812,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { window.hiddenInputFocused = true; } }, - false + false, ); document.body.appendChild(keyboardButton); const placeButton = createTouchButton('placeButton', 'inGame'); @@ -818,14 +822,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { mouseEvent(2, 'mousedown', canvas); }, - false + false, ); placeButton.addEventListener( 'touchend', function (e) { mouseEvent(2, 'mouseup', canvas); }, - false + false, ); document.body.appendChild(placeButton); const breakButton = createTouchButton('breakButton', 'inGame'); @@ -835,14 +839,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { mouseEvent(0, 'mousedown', canvas); }, - false + false, ); breakButton.addEventListener( 'touchend', function (e) { mouseEvent(0, 'mouseup', canvas); }, - false + false, ); document.body.appendChild(breakButton); const selectButton = createTouchButton('selectButton', 'inGame'); @@ -852,14 +856,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { mouseEvent(1, 'mousedown', canvas); }, - false + false, ); selectButton.addEventListener( 'touchend', function (e) { mouseEvent(1, 'mouseup', canvas); }, - false + false, ); document.body.appendChild(selectButton); const scrollUpButton = createTouchButton('scrollUpButton', 'inGame'); @@ -870,7 +874,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { wheelEvent(canvas, -10); }, - false + false, ); document.body.appendChild(scrollUpButton); const scrollDownButton = createTouchButton('scrollDownButton', 'inGame'); @@ -881,7 +885,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { wheelEvent(canvas, 10); }, - false + false, ); document.body.appendChild(scrollDownButton); const throwButton = createTouchButton('throwButton', 'inGame'); @@ -892,14 +896,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent('q', 'keydown'); }, - false + false, ); throwButton.addEventListener( 'touchend', function (e) { keyEvent('q', 'keyup'); }, - false + false, ); document.body.appendChild(throwButton); const sprintButton = createTouchButton('sprintButton', 'inGame'); @@ -914,7 +918,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { sprintButton.classList.toggle('active'); }, 1000); }, - false + false, ); sprintButton.addEventListener( @@ -927,7 +931,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { } clearTimeout(window.sprintTimer); }, - false + false, ); document.body.appendChild(sprintButton); const pauseButton = createTouchButton('pauseButton', 'inGame'); @@ -938,14 +942,14 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent('`', 'keydown'); }, - false + false, ); pauseButton.addEventListener( 'touchend', function (e) { keyEvent('`', 'keyup'); }, - false + false, ); document.body.appendChild(pauseButton); const chatButton = createTouchButton('chatButton', 'inGame'); @@ -956,7 +960,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { function (e) { keyEvent('t', 'keydown'); }, - false + false, ); // For some reason dispatching a keyup event for this closes the chat, which is really weird document.body.appendChild(chatButton); const perspectiveButton = createTouchButton('perspectiveButton', 'inGame'); @@ -968,7 +972,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { keyEvent('f', 'keydown'); keyEvent('5', 'keydown'); }, - false + false, ); perspectiveButton.addEventListener( 'touchend', @@ -976,7 +980,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { keyEvent('f', 'keyup'); keyEvent('5', 'keyup'); }, - false + false, ); document.body.appendChild(perspectiveButton); const screenshotButton = createTouchButton('screenshotButton', 'inGame'); @@ -988,7 +992,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { keyEvent('f', 'keydown'); keyEvent('2', 'keydown'); }, - false + false, ); screenshotButton.addEventListener( 'touchend', @@ -996,7 +1000,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { keyEvent('f', 'keyup'); keyEvent('2', 'keyup'); }, - false + false, ); document.body.appendChild(screenshotButton); const coordinatesButton = createTouchButton('coordinatesButton', 'inGame'); @@ -1008,7 +1012,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { keyEvent('f', 'keydown'); keyEvent('3', 'keydown'); }, - false + false, ); coordinatesButton.addEventListener( 'touchend', @@ -1016,7 +1020,7 @@ if (new URLSearchParams(window.location.search).get('mobile') === 'true') { keyEvent('f', 'keyup'); keyEvent('3', 'keyup'); }, - false + false, ); document.body.appendChild(coordinatesButton); } diff --git a/src/resources/scripts/main.ts b/src/resources/scripts/main.ts index 7529e7b..b87b898 100644 --- a/src/resources/scripts/main.ts +++ b/src/resources/scripts/main.ts @@ -7,7 +7,10 @@ let articleAnimationLock = false; const theme = { load: function (themeToLoad?: string) { const themeElement = document.querySelector('#theme') as HTMLLinkElement | null; - if (themeElement) themeElement.href = themeToLoad ? `/resources/styles/themes/${themeToLoad}.css` : `/resources/styles/themes/${storage.local.get('theme') ?? 'default'}.css`; + if (themeElement) + themeElement.href = themeToLoad + ? `/resources/styles/themes/${themeToLoad}.css` + : `/resources/styles/themes/${storage.local.get('theme') ?? 'default'}.css`; }, set: function (newTheme: string) { storage.local.set('theme', newTheme); @@ -77,7 +80,9 @@ const game = { '1.5': '15-client-version', 'b1.3': 'b13-client-version', }; - const dropdown = clients[client] ? (document.querySelector(`#${clients[client]}`) as HTMLSelectElement | null) : null; + const dropdown = clients[client] + ? (document.querySelector(`#${clients[client]}`) as HTMLSelectElement | null) + : null; if (dropdown?.value) { selectedVersion = `https://archive.eaglercraft.rip/Eaglercraft${client === '1.8' ? 'X_1.8' : `_${client}`}/client/${dropdown.value}/index.html`; game.play(); @@ -174,7 +179,7 @@ const article = { modal.addEventListener('click', closeArticleHandler); articleAnimationLock = false; }, - { once: true } + { once: true }, ); } }, @@ -189,7 +194,7 @@ const article = { modal.style.display = 'none'; articleAnimationLock = false; }, - { once: true } + { once: true }, ); } }, @@ -408,7 +413,13 @@ if (window.location.pathname === '/') { const lastPage = storage.session.get('lastPage'); const isMobile = detect.mobile(); const iframe = document.createElement('iframe'); - iframe.src = !storage.local.get('lastVersion') ? '/welcome/' : lastPage ? lastPage : isMobile ? '/mobile/' : '/home/game/'; + iframe.src = !storage.local.get('lastVersion') + ? '/welcome/' + : lastPage + ? lastPage + : isMobile + ? '/mobile/' + : '/home/game/'; document.addEventListener('DOMContentLoaded', () => document.body.appendChild(iframe)); @@ -429,7 +440,7 @@ if (window.location.pathname === '/') { theme.load(); document.addEventListener('DOMContentLoaded', async () => { - const profileName = document.querySelector('.profile-name'); + const profileName = document.querySelector('.profile span'); const titleBarText = document.querySelector('.title-bar span'); const lastVersion = storage.local.get('lastVersion'); @@ -440,8 +451,11 @@ if (window.location.pathname === '/') { if (profileName) profileName.textContent = storage.local.get('username'); if (titleBarText) titleBarText.textContent += ` ${currentVersion}`; - // @ts-expect-error - if (lastVersion && gt(coerce(currentVersion, { includePrerelease: true }), coerce(lastVersion, { includePrerelease: true }))) { + if ( + lastVersion && + // @ts-expect-error + gt(coerce(currentVersion, { includePrerelease: true }), coerce(lastVersion, { includePrerelease: true })) + ) { alert(`MineXLauncher has been updated to v${currentVersion}!\n\nChanges in v${currentVersion}:\n${changelog}`); storage.local.set('lastVersion', currentVersion); } @@ -469,7 +483,7 @@ if (window.location.pathname === '/') { if (window.location.pathname === '/settings/') { document.addEventListener('DOMContentLoaded', async () => { - const profileName = document.querySelector('.profile-name'); + const profileName = document.querySelector('.profile span'); const usernameInput = document.querySelector('#username-input') as HTMLInputElement | null; const themeSelect = document.querySelector('#theme-select') as HTMLSelectElement | null; const offlineCheckbox = document.querySelector('#offline-checkbox') as HTMLInputElement | null; @@ -506,7 +520,7 @@ if (window.location.pathname === '/settings/') { if (offlineCheckbox.checked) { sw.register('/sw-full.js'); alert( - 'Offline cache is now downloading.\nThe download size is about 1GB, so it may take a while.\n\nPlease do not leave this page while the download is in progress.\nYou will be notified when the download is complete.' + 'Offline cache is now downloading.\nThe download size is about 1GB, so it may take a while.\n\nPlease do not leave this page while the download is in progress.\nYou will be notified when the download is complete.', ); } else { sw.register('/sw.js'); @@ -567,12 +581,15 @@ if (window.location.pathname === '/settings/') { // storage.local.set('offlineCache', offlineCheckbox?.checked ?? false); // storage.local.set('showAds', true); storage.local.set('mods', []); - storage.local.set('lastVersion', (await (await fetch('/resources/data/main.json')).json()).updates[0].version); + storage.local.set( + 'lastVersion', + (await (await fetch('/resources/data/main.json')).json()).updates[0].version, + ); if (offlineCheckbox?.checked) { sw.register('/sw-full.js'); alert( - 'Offline cache is now downloading.\nThe download size is about 1GB, so it may take a while.\n\nPlease do not leave this page while the download is in progress.\nYou will be notified when the download is complete.' + 'Offline cache is now downloading.\nThe download size is about 1GB, so it may take a while.\n\nPlease do not leave this page while the download is in progress.\nYou will be notified when the download is complete.', ); } else sw.register('/sw.js'); @@ -585,7 +602,14 @@ if (window.location.pathname === '/settings/') { } else if (window.location.pathname === '/mods/mods/' || window.location.pathname === '/mods/resourcepacks/') { document.addEventListener('DOMContentLoaded', async () => { const addonType: 'mods' | 'resourcepacks' = window.location.pathname === '/mods/mods/' ? 'mods' : 'resourcepacks'; - const addonData: { id: string; name: string; description: string; author: string; authorLink: string; source: string }[] = (await (await fetch('/resources/data/main.json')).json()).addons; + const addonData: { + id: string; + name: string; + description: string; + author: string; + authorLink: string; + source: string; + }[] = (await (await fetch('/resources/data/main.json')).json()).addons; const modList = document.querySelector('.mod-list'); // @ts-expect-error addonData[addonType].forEach((addon) => { @@ -616,7 +640,9 @@ if (window.location.pathname === '/settings/') { } else if (window.location.pathname === '/updates/') { document.addEventListener('DOMContentLoaded', async () => { const updatesContainer = document.querySelector('.updates-container'); - const updateData: { version: string; changelog: string[] }[] = (await (await fetch('/resources/data/main.json')).json()).updates; + const updateData: { version: string; changelog: string[] }[] = ( + await (await fetch('/resources/data/main.json')).json() + ).updates; updateData.forEach((update) => { const versionHeader = document.createElement('strong'); versionHeader.textContent = `MineXLauncher ${update.version}`; diff --git a/src/resources/styles/themes/campfire.css b/src/resources/styles/themes/campfire.css index ad976e7..3b8fc52 100644 --- a/src/resources/styles/themes/campfire.css +++ b/src/resources/styles/themes/campfire.css @@ -26,8 +26,8 @@ body { border-bottom: 1px solid #4a2f1b; } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected { +.nav-bar li:hover, +.nav-bar li.selected { background-color: #5a3a2a; } diff --git a/src/resources/styles/themes/cherry-blossom.css b/src/resources/styles/themes/cherry-blossom.css index a8e42c5..16c72bb 100644 --- a/src/resources/styles/themes/cherry-blossom.css +++ b/src/resources/styles/themes/cherry-blossom.css @@ -22,8 +22,8 @@ body { border-bottom: 1px solid #e0d1e3; } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected { +.nav-bar li:hover, +.nav-bar li.selected { background-color: #f4c6d0; } diff --git a/src/resources/styles/themes/default.css b/src/resources/styles/themes/default.css index e0ebf01..c99f4de 100644 --- a/src/resources/styles/themes/default.css +++ b/src/resources/styles/themes/default.css @@ -67,7 +67,7 @@ body { text-align: center; } -.profile-name { +.profile span { font-weight: bold; display: block; font-size: 16px; @@ -83,7 +83,7 @@ body { scrollbar-color: #555 #333; } -.nav-bar .nav-item { +.nav-bar li { display: flex; align-items: center; padding: 15px 20px; @@ -91,18 +91,18 @@ body { transition: background-color 0.2s; } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected { +.nav-bar li:hover, +.nav-bar li.selected { background-color: #444; } -.nav-bar .nav-item .nav-icon { +.nav-bar li img { width: 24px; height: 24px; margin-right: 15px; } -.nav-bar .nav-item .nav-text { +.nav-bar li span { font-size: 14px; } @@ -249,7 +249,10 @@ body { scrollbar-color: #048239 #035525; max-height: 0; overflow: auto; - transition: max-height 0.3s ease-out, padding 0.3s ease-out, opacity 0.3s ease-out; + transition: + max-height 0.3s ease-out, + padding 0.3s ease-out, + opacity 0.3s ease-out; } .custom-options.open { @@ -292,7 +295,10 @@ body { font-size: 16px; font-weight: bold; text-transform: uppercase; - transition: background-color 0.2s, border-color 0.2s, transform 0.2s; + transition: + background-color 0.2s, + border-color 0.2s, + transform 0.2s; overflow: hidden; position: relative; } @@ -539,11 +545,18 @@ body { font-size: 1rem; cursor: pointer; appearance: none; - background-image: linear-gradient(45deg, transparent 50%, #ffffff 50%), linear-gradient(135deg, #1e1e1e 50%, transparent 50%); - background-position: right 0.7rem center, right 0.7rem center; + background-image: linear-gradient(45deg, transparent 50%, #ffffff 50%), + linear-gradient(135deg, #1e1e1e 50%, transparent 50%); + background-position: + right 0.7rem center, + right 0.7rem center; background-repeat: no-repeat; - background-size: 0.65rem auto, 0.65rem auto; - transition: border-color 0.3s, background-color 0.3s; + background-size: + 0.65rem auto, + 0.65rem auto; + transition: + border-color 0.3s, + background-color 0.3s; } .version-select:focus { diff --git a/src/resources/styles/themes/hyperdark.css b/src/resources/styles/themes/hyperdark.css index dbd37d4..f99369d 100644 --- a/src/resources/styles/themes/hyperdark.css +++ b/src/resources/styles/themes/hyperdark.css @@ -18,8 +18,8 @@ body { background-color: #262626; } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected { +.nav-bar li:hover, +.nav-bar li.selected { background-color: #333; } diff --git a/src/resources/styles/themes/light.css b/src/resources/styles/themes/light.css index 7278ab2..2712256 100644 --- a/src/resources/styles/themes/light.css +++ b/src/resources/styles/themes/light.css @@ -1,111 +1,117 @@ body { - background-color: #f5f5f5; - color: #333; + background-color: #f5f5f5; + color: #333; } .launcher { - background-color: #fff; - box-shadow: 0 0 20px rgba(0, 0, 0, 0.1); + background-color: #fff; + box-shadow: 0 0 20px rgba(0, 0, 0, 0.1); } -.title-bar, .top-title, .top-nav, .bottom-bar { - background-color: #e0e0e0; - color: #333; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); +.title-bar, +.top-title, +.top-nav, +.bottom-bar { + background-color: #e0e0e0; + color: #333; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); } .sidebar { - background-color: #f0f0f0; - border-right: 1px solid #ddd; + background-color: #f0f0f0; + border-right: 1px solid #ddd; } .profile { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #ddd; } -.nav-bar .nav-item { - color: #333; +.nav-bar li { + color: #333; } -.nav-bar .nav-item:hover, .nav-bar .nav-item.selected { - background-color: #ddd; +.nav-bar li:hover, +.nav-bar li.selected { + background-color: #ddd; } -.main-panel, .main-content { - background-color: #fafafa; +.main-panel, +.main-content { + background-color: #fafafa; } .installations { - background-color: #e0e0e0; - border-top: 1px solid #ddd; + background-color: #e0e0e0; + border-top: 1px solid #ddd; } .custom-select { - border: 2px solid #ccc; - background-color: #fff; - color: #333; - box-shadow: 4px 4px #ddd; + border: 2px solid #ccc; + background-color: #fff; + color: #333; + box-shadow: 4px 4px #ddd; } .custom-select:hover { - box-shadow: 6px 6px #ddd; + box-shadow: 6px 6px #ddd; } .custom-options { - border: 2px solid #ccc; - background-color: #fff; - box-shadow: 4px 4px #ddd; + border: 2px solid #ccc; + background-color: #fff; + box-shadow: 4px 4px #ddd; } .custom-option { - border-bottom: 1px solid #ccc; - color: #333; + border-bottom: 1px solid #ccc; + color: #333; } .custom-option:hover { - background-color: #f0f0f0; + background-color: #f0f0f0; } .play-button { - background-color: #4caf50; - border: 2px solid #388e3c; - color: #fff; + background-color: #4caf50; + border: 2px solid #388e3c; + color: #fff; } .play-button:hover { - background-color: #66bb6a; - border-color: #2e7d32; + background-color: #66bb6a; + border-color: #2e7d32; } -.bottom-bar .bottom-bar-left, .bottom-bar .bottom-bar-right { - color: #333; +.bottom-bar .bottom-bar-left, +.bottom-bar .bottom-bar-right { + color: #333; } .minecraft-button { - background-color: #e0e0e0; - border: 1px solid #ccc; + background-color: #e0e0e0; + border: 1px solid #ccc; } .minecraft-button:hover { - background-color: #d5d5d5; + background-color: #d5d5d5; } .minecraft-button:active { - background-color: #bdbdbd; + background-color: #bdbdbd; } .download-link { - background-color: #4caf50; + background-color: #4caf50; } .download-link:hover { - background-color: #66bb6a; + background-color: #66bb6a; } .top-nav ul li { - color: #666; + color: #666; } .top-nav ul li.selected { - color: #333; -} \ No newline at end of file + color: #333; +} diff --git a/src/resources/styles/themes/nether.css b/src/resources/styles/themes/nether.css index 951f284..18cc58e 100644 --- a/src/resources/styles/themes/nether.css +++ b/src/resources/styles/themes/nether.css @@ -25,8 +25,8 @@ body { color: #ff4500; } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected { +.nav-bar li:hover, +.nav-bar li.selected { background-color: #5c3c3c; } diff --git a/src/resources/styles/themes/overworld.css b/src/resources/styles/themes/overworld.css index 582bd74..ab6186e 100644 --- a/src/resources/styles/themes/overworld.css +++ b/src/resources/styles/themes/overworld.css @@ -25,8 +25,8 @@ body { color: #00ff00; } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected { +.nav-bar li:hover, +.nav-bar li.selected { background-color: #5c7c5c; } diff --git a/src/resources/styles/themes/retro.css b/src/resources/styles/themes/retro.css index 5af0200..219bf23 100644 --- a/src/resources/styles/themes/retro.css +++ b/src/resources/styles/themes/retro.css @@ -26,7 +26,7 @@ body { } .profile, -.nav-bar .nav-item, +.nav-bar li, .installations, .custom-select, .custom-options, @@ -38,8 +38,8 @@ body { color: #00ff00; } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected, +.nav-bar li:hover, +.nav-bar li.selected, .custom-option:hover, .play-button:hover, .minecraft-button:hover, diff --git a/src/resources/styles/themes/starfall.css b/src/resources/styles/themes/starfall.css index 414cc97..52d33cb 100644 --- a/src/resources/styles/themes/starfall.css +++ b/src/resources/styles/themes/starfall.css @@ -18,8 +18,8 @@ body { box-shadow: 0 2px 4px rgba(255, 255, 255, 0.2); } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected { +.nav-bar li:hover, +.nav-bar li.selected { background-color: rgba(255, 255, 255, 0.1); color: #00ccff; } diff --git a/src/resources/styles/themes/the-end.css b/src/resources/styles/themes/the-end.css index 04858f5..bb2ad26 100644 --- a/src/resources/styles/themes/the-end.css +++ b/src/resources/styles/themes/the-end.css @@ -27,8 +27,8 @@ body { border-bottom: 1px solid #330066; } -.nav-bar .nav-item:hover, -.nav-bar .nav-item.selected { +.nav-bar li:hover, +.nav-bar li.selected { background-color: #330066; } diff --git a/src/servers/index.html b/src/servers/index.html index 0b1bd57..1bcdb06 100644 --- a/src/servers/index.html +++ b/src/servers/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -60,7 +67,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -68,7 +77,14 @@
    - +
    diff --git a/src/settings/index.html b/src/settings/index.html index 4dcd944..310ac5f 100644 --- a/src/settings/index.html +++ b/src/settings/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -80,7 +87,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -88,7 +97,14 @@
    - +
    diff --git a/src/sw-full.ts b/src/sw-full.ts index 3ebed3d..ad0e4e9 100644 --- a/src/sw-full.ts +++ b/src/sw-full.ts @@ -16,7 +16,7 @@ self.addEventListener('install', (event) => { console.log(`Cached: ${asset} (${progress})`); } - }) + }), ); }); @@ -32,7 +32,7 @@ self.addEventListener('activate', (event) => { } else { return null; } - }) + }), ); }) .then(() => { @@ -46,7 +46,7 @@ self.addEventListener('activate', (event) => { }); }); }); - }) + }), ); }); @@ -54,6 +54,6 @@ self.addEventListener('fetch', (event) => { event.respondWith( caches.match(event.request).then((response) => { return response ?? fetch(event.request); - }) + }), ); }); diff --git a/src/sw.ts b/src/sw.ts index 3c62b7e..aa87740 100644 --- a/src/sw.ts +++ b/src/sw.ts @@ -55,7 +55,7 @@ self.addEventListener('install', (event) => { console.log(`Cached: ${asset} (${progress})`); } - }) + }), ); }); @@ -69,9 +69,9 @@ self.addEventListener('activate', (event) => { } else { return null; } - }) + }), ); - }) + }), ); }); @@ -80,13 +80,13 @@ self.addEventListener('fetch', (event) => { event.respondWith( fetch(event.request).catch(() => { return caches.match(OFFLINE_URL); - }) + }), ); } else { event.respondWith( fetch(event.request).catch(() => { return caches.match(event.request); - }) + }), ); } }); diff --git a/src/updates/index.html b/src/updates/index.html index 8906e1a..e2c5ac0 100644 --- a/src/updates/index.html +++ b/src/updates/index.html @@ -1,4 +1,4 @@ - + @@ -12,7 +12,14 @@
    - +
    @@ -21,32 +28,32 @@
    - +
    @@ -61,7 +68,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved. @@ -69,7 +78,14 @@
    - +
    diff --git a/src/welcome/index.html b/src/welcome/index.html index 3486aa8..a33049a 100644 --- a/src/welcome/index.html +++ b/src/welcome/index.html @@ -1,4 +1,4 @@ - + @@ -39,7 +39,9 @@
    - Join the MineXLauncher Discord + Join the MineXLauncher Discord
    © 2024 MineXLauncher. All rights reserved.