diff --git a/public/index.php b/public/index.php index 8f65ae6..300379e 100644 --- a/public/index.php +++ b/public/index.php @@ -65,9 +65,15 @@ $router->get('/', function($response, $request) use ($db, $remote, $loginUrl, $u $body .= ''; } - if($userInfo->success) { + if(!$userInfo->success) { + $body .= '
'; + $body .= '

You must be logged in to use this website!

'; + $body .= '

This website allows you to whitelist yourself on our Minecraft servers, for which you need to be logged in.

'; + $body .= '

So it doesn\'t make sense to display the details either.

'; + $body .= '
'; + } else { if($userInfo->mc_whitelisted < 1) { - $body .= '
'; + $body .= '
'; $body .= '

Add to Whitelist

'; $body .= '

This will give you access to the server.

'; $body .= '
'; @@ -81,29 +87,30 @@ $router->get('/', function($response, $request) use ($db, $remote, $loginUrl, $u $body .= '
'; } - $body .= '
'; - $body .= '

Server address

'; - $body .= '

Down currently because I don\'t have the resources to run multiple games at once yet.

'; - //$body .= '
mc.flashii.net
'; - //$body .= '

An SRV record is used, so no port needs to be specified.

'; - $body .= '

We recommend you use MultiMC/PolyMC for easy version and mod management and Adoptium Java 17 to actually be able to launch the game. Other launchers work completely fine though.

'; + $body .= '
'; + $body .= '

Servers

'; + $body .= ' '; + $body .= ' '; + $body .= ' '; + $body .= ' '; + $body .= ' '; + // $body .= ' '; + // $body .= ' '; + // $body .= ' '; + $body .= ' '; + $body .= ' '; + $body .= '
Name Address Java version Bedrock version Details
Vanilla Survival mc-survival.flashii.net 1.19.2 N/A Regular Minecraft Survival with some server-side extensions.
Beta Survival mc-beta.flashii.net Beta 1.7.3 N/A Classic Minecraft Survival!
Tekkit Classic mc-tekkit.flashii.net 1.2.5 N/A Page for this modpack on the Technic Platform
All of Fabric 6 mc-aof6.flashii.net 1.19.2 N/A Page for this modpack on CurseForge
'; $body .= '
'; - $body .= '
'; - $body .= '

Bedrock versions

'; - $body .= '

Through the black magic bestowed upon us by GeyserMC it\'s possible to play on the server through any of the updated Bedrock versions of Minecraft.

'; - $body .= '

This should allow you to play on the server from a phone, a tablet or a console, provided you also have an account for the original version of the game.

'; - $body .= '

You will need to link your Minecraft and Bedrock accounts, you can do this by connecting to link.geysermc.org in both versions of the game and following the on-screen instructions.

'; - $body .= '

Unfortunately, the Bedrock versions of the game don\'t support SRV records, so you\'ll have to join with a different address:

'; - //$body .= '
mcb.flashii.net:19132
'; - $body .= '

Also down, lol!

'; - $body .= '
'; - if($userInfo->mc_whitelisted > 0) { - $body .= '
'; + $body .= '
'; $body .= '

Remove from Whitelist

'; $body .= '

This will revoke your access to the server.

'; $body .= sprintf('

You are currently whitelisted as %s on %s.

', $userInfo->mc_username, date('Y-m-d H:i:s T', $userInfo->mc_whitelisted)); + if(floor($userInfo->mc_whitelisted / 300) === floor(time() / 300)) { + $body .= '

The whitelists are synchronised once every 5 minutes, you\'ll be able to play soon!

'; + $body .= '

If you\'re playing a modpack, take that time to start the game up; it\'ll take a while.

'; + } $body .= ' '; $body .= sprintf(' ', $sVerification); $body .= ' '; @@ -111,24 +118,18 @@ $router->get('/', function($response, $request) use ($db, $remote, $loginUrl, $u $body .= '
'; } - $body .= '
'; - $body .= '

All Of Fabric 5 (1.3.0)

'; - $body .= '
aof.flashii.net
'; - $body .= '

An SRV record is used, so no port needs to be specified.

'; - $body .= '

There\'s a pack for MultiMC/PolyMC somewhere and you\'ll probably need Adoptium Java 17 to actually be able to launch the game. Other launchers work completely fine though, probably.

'; - $body .= '

This server doesn\'t currently use a whitelist, so you don\'t have to worry about that.

'; - $body .= '
'; - } else { - $body .= '
'; - $body .= '

You must be logged in to use this website!

'; - $body .= '

This website allows you to whitelist yourself on our Minecraft server, for which you need to be logged in.

'; - $body .= '

So it doesn\'t make sense to display the details either.

'; + $body .= '
'; + $body .= '

Bedrock versions

'; + $body .= '

Through the black magic bestowed upon us by GeyserMC it\'s possible to play on the server through any of the updated Bedrock versions of Minecraft.

'; + $body .= '

This should allow you to play on the server from a phone, a tablet or a console, provided you also have an account for the original version of the game.

'; + $body .= '

You will need to link your Minecraft and Bedrock accounts, you can do this by connecting to link.geysermc.org in both versions of the game and following the on-screen instructions.

'; + $body .= '

Do note that this only works for servers where both a Java and Bedrock version number is listed!

'; $body .= '
'; } - $body .= '
'; + $body .= '
'; $body .= '

Rules

'; - $body .= '

1. Observe Global Rules.

'; + $body .= '

1. Observe Global Rules.

'; $body .= '

2. Don\'t be an asshole.

'; $body .= '

3. Don\'t flood.

'; $body .= '
'; diff --git a/public/mince.css b/public/mince.css index 7132715..3e0e59d 100644 --- a/public/mince.css +++ b/public/mince.css @@ -63,17 +63,20 @@ body { } .content { - max-width: 1000px; + max-width: 1020px; width: 100%; margin: 0 auto; margin-top: 1em; - padding: 20px 0 40px; + padding: 5px 10px 40px; } -.details p { +.section { + margin: 15px 0; +} +.section p { margin: .2em 0; } -.details pre { +.section pre { font-size: 1.5em; } @@ -82,9 +85,6 @@ body { color: #f33; } -.whitelist { - margin-bottom: 20px; -} .whitelist input[type="submit"] { font-size: 1.5em; margin: 5px; @@ -103,9 +103,6 @@ body { background-color: #232; } -.unwhitelist { - margin-top: 20px; -} .unwhitelist input[type="submit"] { font-size: 1.5em; margin: 5px; @@ -142,16 +139,30 @@ label .label-input input { width: 100%; } -.rules { - margin-top: 20px; +.servers { + margin: 0 auto; + font-size: 1.1em; + line-height: 1.4em; + border-spacing: 1px; } - -.bedrock { - margin-top: 20px; +.servers th { + border-bottom: 1px solid #888; + background-image: linear-gradient(0deg, #444 0, transparent 50%); } -.bedrock pre { - font-size: 1.5em; +.servers th, +.servers td { + padding: 0 10px; } -.bedrock p { - margin: .2em 0; +.servers .col-name { + font-weight: 700; +} +.servers .col-java, +.servers .col-bedrock { + text-align: center; +} +.servers tbody tr:nth-child(odd) td { + background-color: #222; +} +.servers tbody tr:nth-child(even) td { + background-color: #333; } diff --git a/src/HTML.php b/src/HTML.php index 1ed4b03..dae1e78 100644 --- a/src/HTML.php +++ b/src/HTML.php @@ -15,6 +15,7 @@ final class HTML { {$title} +