Merge branch 'develop' into v2

database/Seeders/eggs/minecraft/egg-bungeecord.json

@@ -9,7 +9,8 @@
     "author": "support@pterodactyl.io",
     "description": "For a long time, Minecraft server owners have had a dream that encompasses a free, easy, and reliable way to connect multiple Minecraft servers together. BungeeCord is the answer to said dream. Whether you are a small server wishing to string multiple game-modes together, or the owner of the ShotBow Network, BungeeCord is the ideal solution for you. With the help of BungeeCord, you will be able to unlock your community's full potential.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
@@ -51,4 +52,4 @@
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         }
     ]
-}
+}

database/Seeders/eggs/minecraft/egg-forge-minecraft.json

@@ -9,7 +9,8 @@
     "author": "support@pterodactyl.io",
     "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
@@ -69,4 +70,4 @@
             "rules": "nullable|string|max:20"
         }
     ]
-}
+}

database/Seeders/eggs/minecraft/egg-paper.json

@@ -9,7 +9,8 @@
     "author": "parker@pterodactyl.io",
     "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",

database/Seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json

@@ -9,7 +9,8 @@
     "author": "support@pterodactyl.io",
     "description": "SpongeVanilla is the SpongeAPI implementation for Vanilla Minecraft.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",

database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json

@@ -9,7 +9,8 @@
     "author": "support@pterodactyl.io",
     "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
@@ -51,4 +52,4 @@
             "rules": "required|string|between:3,15"
         }
     ]
-}
+}

resources/scripts/components/server/ServerConsole.tsx

@@ -57,12 +57,10 @@ const ServerConsole = () => {
                     </ErrorBoundary>
                     <ChunkedStatGraphs/>
                 </Spinner.Suspense>
-                {eggFeatures.includes('eula') &&
                 <React.Suspense fallback={null}>
-                    <EulaModalFeature/>
-                    <JavaVersionModalFeature/>
+                    {eggFeatures.includes('eula') && <EulaModalFeature/>}
+                    {eggFeatures.includes('java_version') && <JavaVersionModalFeature/>}
                 </React.Suspense>
-                }
             </div>
         </ServerContentBlock>
     );