From 250fb2d58fc31fb0ed76f25c2d0e78cc5bc2f0b8 Mon Sep 17 00:00:00 2001 From: Minionguyjpro Date: Wed, 1 May 2024 15:38:11 +0200 Subject: [PATCH] Bump Minecraft Default Java Version Value to 21 (Ensure Compatibility with 1.20.5+) [PUFFERPANEL'S TEMURIN DOCKER IMAGE NEEDS UPDATE TO SUPPORT JDK 21 FIRST, unless it uses the original Temurin image?] (#273) * Bump Default Java Version to 21 (Ensure Compatibility with 1.20.5+) * Fix Missing Java 21 Bumps * Fix minecraft-forge-legacy * Fix minecraft-forge-legacy * Fix Last Minecraft Templates --- minecraft-autoplug/minecraft-autoplug-docker.json | 2 +- minecraft-autoplug/minecraft-autoplug.json | 2 +- .../minecraft-bungeecord-docker.json | 2 +- minecraft-bungeecord/minecraft-bungeecord.json | 2 +- minecraft-fabric/minecraft-fabric-docker.json | 2 +- minecraft-fabric/minecraft-fabric.json | 2 +- .../minecraft-forge-legacy-docker.json | 2 +- minecraft-forge-legacy/minecraft-forge-legacy.json | 2 +- minecraft-forge/minecraft-forge-docker.json | 2 +- minecraft-forge/minecraft-forge.json | 2 +- minecraft-ftb-fabric/minecraft-ftb-fabric.json | 2 +- minecraft-ftb/minecraft-ftb-docker.json | 2 +- minecraft-ftb/minecraft-ftb.json | 2 +- minecraft-magma/minecraft-magma-docker.json | 2 +- minecraft-magma/minecraft-magma.json | 2 +- .../minecraft-modpack-gtnh-docker.json | 14 +++++++------- minecraft-modpack-gtnh/minecraft-modpack-gtnh.json | 14 +++++++------- minecraft-mohist/minecraft-mohist-docker.json | 2 +- minecraft-mohist/minecraft-mohist.json | 2 +- minecraft-paper/minecraft-paper-docker.json | 2 +- minecraft-paper/minecraft-paper.json | 2 +- minecraft-purpur/minecraft-purpur-docker.json | 2 +- minecraft-purpur/minecraft-purpur.json | 2 +- minecraft-quilt/minecraft-quilt.json | 2 +- minecraft-spigot/minecraft-spigot-docker.json | 2 +- minecraft-spigot/minecraft-spigot.json | 4 ++-- minecraft-vanilla/minecraft-vanilla-docker.json | 2 +- minecraft-vanilla/minecraft-vanilla.json | 2 +- minecraft-velocity/minecraft-velocity-docker.json | 2 +- minecraft-velocity/minecraft-velocity.json | 2 +- .../minecraft-waterfall-docker.json | 2 +- minecraft-waterfall/minecraft-waterfall.json | 2 +- 32 files changed, 45 insertions(+), 45 deletions(-) diff --git a/minecraft-autoplug/minecraft-autoplug-docker.json b/minecraft-autoplug/minecraft-autoplug-docker.json index 12ec5973..55d7d175 100644 --- a/minecraft-autoplug/minecraft-autoplug-docker.json +++ b/minecraft-autoplug/minecraft-autoplug-docker.json @@ -63,6 +63,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-autoplug/minecraft-autoplug.json b/minecraft-autoplug/minecraft-autoplug.json index ae810f56..3d722e49 100644 --- a/minecraft-autoplug/minecraft-autoplug.json +++ b/minecraft-autoplug/minecraft-autoplug.json @@ -43,7 +43,7 @@ "desc": "Version of Java to use", "display": "Java Version", "required": true, - "value": "17" + "value": "21" } }, "install": [ diff --git a/minecraft-bungeecord/minecraft-bungeecord-docker.json b/minecraft-bungeecord/minecraft-bungeecord-docker.json index b6f9e3fa..701cddf3 100644 --- a/minecraft-bungeecord/minecraft-bungeecord-docker.json +++ b/minecraft-bungeecord/minecraft-bungeecord-docker.json @@ -50,6 +50,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } \ No newline at end of file diff --git a/minecraft-bungeecord/minecraft-bungeecord.json b/minecraft-bungeecord/minecraft-bungeecord.json index e5ccdfa1..09c26577 100644 --- a/minecraft-bungeecord/minecraft-bungeecord.json +++ b/minecraft-bungeecord/minecraft-bungeecord.json @@ -36,7 +36,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-fabric/minecraft-fabric-docker.json b/minecraft-fabric/minecraft-fabric-docker.json index 799a7961..cf11acfb 100644 --- a/minecraft-fabric/minecraft-fabric-docker.json +++ b/minecraft-fabric/minecraft-fabric-docker.json @@ -90,6 +90,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-fabric/minecraft-fabric.json b/minecraft-fabric/minecraft-fabric.json index 8b2b85e2..12b9e675 100644 --- a/minecraft-fabric/minecraft-fabric.json +++ b/minecraft-fabric/minecraft-fabric.json @@ -48,7 +48,7 @@ "type": "integer", "desc": "Version of Java to use (If you play 1.16.5 or lower use 8)", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-forge-legacy/minecraft-forge-legacy-docker.json b/minecraft-forge-legacy/minecraft-forge-legacy-docker.json index 41a3adfa..1bc4e8b7 100644 --- a/minecraft-forge-legacy/minecraft-forge-legacy-docker.json +++ b/minecraft-forge-legacy/minecraft-forge-legacy-docker.json @@ -121,4 +121,4 @@ "type": "docker", "image": "eclipse-temurin:8" } -} \ No newline at end of file +} diff --git a/minecraft-forge-legacy/minecraft-forge-legacy.json b/minecraft-forge-legacy/minecraft-forge-legacy.json index 115b7590..8c347e94 100644 --- a/minecraft-forge-legacy/minecraft-forge-legacy.json +++ b/minecraft-forge-legacy/minecraft-forge-legacy.json @@ -130,4 +130,4 @@ "environment": { "type": "standard" } -} \ No newline at end of file +} diff --git a/minecraft-forge/minecraft-forge-docker.json b/minecraft-forge/minecraft-forge-docker.json index 4d5443aa..f4869669 100644 --- a/minecraft-forge/minecraft-forge-docker.json +++ b/minecraft-forge/minecraft-forge-docker.json @@ -77,6 +77,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-forge/minecraft-forge.json b/minecraft-forge/minecraft-forge.json index c2a1ad54..58c47ee9 100644 --- a/minecraft-forge/minecraft-forge.json +++ b/minecraft-forge/minecraft-forge.json @@ -41,7 +41,7 @@ "internal": false }, "javaversion": { - "value": "17", + "value": "21", "required": true, "desc": "Version of Java to use", "display": "Java Version" diff --git a/minecraft-ftb-fabric/minecraft-ftb-fabric.json b/minecraft-ftb-fabric/minecraft-ftb-fabric.json index d214d0e9..c2211eed 100644 --- a/minecraft-ftb-fabric/minecraft-ftb-fabric.json +++ b/minecraft-ftb-fabric/minecraft-ftb-fabric.json @@ -63,7 +63,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true }, "memory": { diff --git a/minecraft-ftb/minecraft-ftb-docker.json b/minecraft-ftb/minecraft-ftb-docker.json index 03f03dfc..816d9b4d 100644 --- a/minecraft-ftb/minecraft-ftb-docker.json +++ b/minecraft-ftb/minecraft-ftb-docker.json @@ -100,7 +100,7 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" }, "requirements": { "os": "linux", diff --git a/minecraft-ftb/minecraft-ftb.json b/minecraft-ftb/minecraft-ftb.json index 11cd7e0d..8cf7f1a3 100644 --- a/minecraft-ftb/minecraft-ftb.json +++ b/minecraft-ftb/minecraft-ftb.json @@ -69,7 +69,7 @@ "value": "" }, "javaversion": { - "value": "17", + "value": "21", "required": true, "desc": "Version of Java to use", "display": "Java Version" diff --git a/minecraft-magma/minecraft-magma-docker.json b/minecraft-magma/minecraft-magma-docker.json index b55b5cec..9790159d 100644 --- a/minecraft-magma/minecraft-magma-docker.json +++ b/minecraft-magma/minecraft-magma-docker.json @@ -86,6 +86,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-magma/minecraft-magma.json b/minecraft-magma/minecraft-magma.json index e5476a28..aa42a8bf 100644 --- a/minecraft-magma/minecraft-magma.json +++ b/minecraft-magma/minecraft-magma.json @@ -60,7 +60,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-modpack-gtnh/minecraft-modpack-gtnh-docker.json b/minecraft-modpack-gtnh/minecraft-modpack-gtnh-docker.json index 86cdf08e..0c4fe5ec 100644 --- a/minecraft-modpack-gtnh/minecraft-modpack-gtnh-docker.json +++ b/minecraft-modpack-gtnh/minecraft-modpack-gtnh-docker.json @@ -5,7 +5,7 @@ "install": [ { "files": [ - "http://downloads.gtnewhorizons.com/ServerPacks/GT_New_Horizons_${gtnh-ver}_Server_Java_17-19.zip" + "http://downloads.gtnewhorizons.com/ServerPacks/GT_New_Horizons_${gtnh-ver}_Server_Java_17-21.zip" ], "type": "download" }, @@ -17,7 +17,7 @@ }, { "commands": [ - "unzip -o *_${gtnh-ver}_Server_Java_17-19.zip" + "unzip -o *_${gtnh-ver}_Server_Java_21-19.zip" ], "type": "command" }, @@ -33,7 +33,7 @@ }, { "commands": [ - "rm GT_New_Horizons_${gtnh-ver}_Server_Java_17-19.zip" + "rm GT_New_Horizons_${gtnh-ver}_Server_Java_17-21.zip" ], "type": "command" } @@ -56,10 +56,10 @@ }, "gtnh-ver": { "type": "string", - "desc": "May be located here. E.g. \"2.2.9\" or \"2.3.0-RC-3\".", + "desc": "May be located here. E.g. \"2.4.0\" or \"2.5.0-RC-1\".", "display": "GT: New Horizons version", "required": true, - "value": "2.3.0" + "value": "2.4.0" }, "ip": { "type": "string", @@ -92,12 +92,12 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" }, "supportedEnvironments": [ { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } ], "requirements": { diff --git a/minecraft-modpack-gtnh/minecraft-modpack-gtnh.json b/minecraft-modpack-gtnh/minecraft-modpack-gtnh.json index beca2cf5..f4af417e 100644 --- a/minecraft-modpack-gtnh/minecraft-modpack-gtnh.json +++ b/minecraft-modpack-gtnh/minecraft-modpack-gtnh.json @@ -5,7 +5,7 @@ "install": [ { "files": [ - "http://downloads.gtnewhorizons.com/ServerPacks/GT_New_Horizons_${gtnh-ver}_Server_Java_17-19.zip" + "http://downloads.gtnewhorizons.com/ServerPacks/GT_New_Horizons_${gtnh-ver}_Server_Java_17-21.zip" ], "type": "download" }, @@ -17,7 +17,7 @@ }, { "commands": [ - "unzip -o *_${gtnh-ver}_Server_Java_17-19.zip" + "unzip -o *_${gtnh-ver}_Server_Java_17-21.zip" ], "type": "command" }, @@ -33,18 +33,18 @@ }, { "commands": [ - "rm GT_New_Horizons_${gtnh-ver}_Server_Java_17-19.zip" + "rm GT_New_Horizons_${gtnh-ver}_Server_Java_17-21.zip" ], "type": "command" }, { "type": "javadl", - "version": "17" + "version": "21" } ], "run": { "stop": "stop", - "command": "java17 -Xms${memory}M -Xmx${memory}M -Dfml.readTimeout=180 -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+AlwaysActAsServerClassMachine -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseNUMA -XX:NmethodSweepActivity=1 -XX:ReservedCodeCacheSize=400M -XX:NonNMethodCodeHeapSize=12M -XX:ProfiledCodeHeapSize=194M -XX:NonProfiledCodeHeapSize=194M -XX:-DontCompileHugeMethods -XX:MaxNodeLimit=240000 -XX:NodeLimitFudgeFactor=8000 -XX:+UseVectorCmov -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:ThreadPriorityPolicy=1 -XX:AllocatePrefetchStyle=3 -XX:+UseG1GC -XX:MaxGCPauseMillis=130 -XX:G1NewSizePercent=28 -XX:G1HeapRegionSize=16M -XX:G1ReservePercent=20 -XX:G1MixedGCCountTarget=3 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=0 -XX:SurvivorRatio=32 -XX:MaxTenuringThreshold=1 -XX:G1SATBBufferEnqueueingThresholdPercent=30 -XX:G1ConcMarkStepDurationMillis=5 -XX:G1ConcRSHotCardLimit=16 -XX:G1ConcRefinementServiceIntervalMillis=150 @java9args.txt nogui", + "command": "java21 -Xms${memory}M -Xmx${memory}M -Dfml.readTimeout=180 -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+AlwaysActAsServerClassMachine -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseNUMA -XX:NmethodSweepActivity=1 -XX:ReservedCodeCacheSize=400M -XX:NonNMethodCodeHeapSize=12M -XX:ProfiledCodeHeapSize=194M -XX:NonProfiledCodeHeapSize=194M -XX:-DontCompileHugeMethods -XX:MaxNodeLimit=240000 -XX:NodeLimitFudgeFactor=8000 -XX:+UseVectorCmov -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:ThreadPriorityPolicy=1 -XX:AllocatePrefetchStyle=3 -XX:+UseG1GC -XX:MaxGCPauseMillis=130 -XX:G1NewSizePercent=28 -XX:G1HeapRegionSize=16M -XX:G1ReservePercent=20 -XX:G1MixedGCCountTarget=3 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=0 -XX:SurvivorRatio=32 -XX:MaxTenuringThreshold=1 -XX:G1SATBBufferEnqueueingThresholdPercent=30 -XX:G1ConcMarkStepDurationMillis=5 -XX:G1ConcRSHotCardLimit=16 -XX:G1ConcRefinementServiceIntervalMillis=150 @java9args.txt nogui", "workingDirectory": "", "pre": [], "post": [], @@ -60,10 +60,10 @@ }, "gtnh-ver": { "type": "string", - "desc": "May be located here. E.g. \"2.2.9\" or \"2.3.0-RC-3\".", + "desc": "May be located here. E.g. \"2.4.0\" or \"2.5.0-RC-1\".", "display": "GT: New Horizons version", "required": true, - "value": "2.3.0" + "value": "2.4.0" }, "ip": { "type": "string", diff --git a/minecraft-mohist/minecraft-mohist-docker.json b/minecraft-mohist/minecraft-mohist-docker.json index da6511ba..75fd49c3 100644 --- a/minecraft-mohist/minecraft-mohist-docker.json +++ b/minecraft-mohist/minecraft-mohist-docker.json @@ -87,6 +87,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-mohist/minecraft-mohist.json b/minecraft-mohist/minecraft-mohist.json index 705f2084..3dab4824 100644 --- a/minecraft-mohist/minecraft-mohist.json +++ b/minecraft-mohist/minecraft-mohist.json @@ -61,7 +61,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-paper/minecraft-paper-docker.json b/minecraft-paper/minecraft-paper-docker.json index 12eb901c..eac8a36d 100644 --- a/minecraft-paper/minecraft-paper-docker.json +++ b/minecraft-paper/minecraft-paper-docker.json @@ -82,6 +82,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-paper/minecraft-paper.json b/minecraft-paper/minecraft-paper.json index 23970e77..dda64825 100644 --- a/minecraft-paper/minecraft-paper.json +++ b/minecraft-paper/minecraft-paper.json @@ -58,7 +58,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-purpur/minecraft-purpur-docker.json b/minecraft-purpur/minecraft-purpur-docker.json index 00c4f4a9..485c96f8 100644 --- a/minecraft-purpur/minecraft-purpur-docker.json +++ b/minecraft-purpur/minecraft-purpur-docker.json @@ -82,6 +82,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-purpur/minecraft-purpur.json b/minecraft-purpur/minecraft-purpur.json index e9d61632..7d05013e 100644 --- a/minecraft-purpur/minecraft-purpur.json +++ b/minecraft-purpur/minecraft-purpur.json @@ -58,7 +58,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-quilt/minecraft-quilt.json b/minecraft-quilt/minecraft-quilt.json index 307909c1..451fc8ff 100644 --- a/minecraft-quilt/minecraft-quilt.json +++ b/minecraft-quilt/minecraft-quilt.json @@ -49,7 +49,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-spigot/minecraft-spigot-docker.json b/minecraft-spigot/minecraft-spigot-docker.json index 8b9959aa..d2785f86 100644 --- a/minecraft-spigot/minecraft-spigot-docker.json +++ b/minecraft-spigot/minecraft-spigot-docker.json @@ -81,6 +81,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } \ No newline at end of file diff --git a/minecraft-spigot/minecraft-spigot.json b/minecraft-spigot/minecraft-spigot.json index 754a1c8a..fe356a3f 100644 --- a/minecraft-spigot/minecraft-spigot.json +++ b/minecraft-spigot/minecraft-spigot.json @@ -51,7 +51,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, @@ -67,7 +67,7 @@ { "type": "command", "commands": [ - "java17 -jar BuildTools.jar --rev ${version}" + "java21 -jar BuildTools.jar --rev ${version}" ] }, { diff --git a/minecraft-vanilla/minecraft-vanilla-docker.json b/minecraft-vanilla/minecraft-vanilla-docker.json index 7650ff42..b8289cde 100644 --- a/minecraft-vanilla/minecraft-vanilla-docker.json +++ b/minecraft-vanilla/minecraft-vanilla-docker.json @@ -71,6 +71,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } \ No newline at end of file diff --git a/minecraft-vanilla/minecraft-vanilla.json b/minecraft-vanilla/minecraft-vanilla.json index 5684505b..984d1074 100644 --- a/minecraft-vanilla/minecraft-vanilla.json +++ b/minecraft-vanilla/minecraft-vanilla.json @@ -51,7 +51,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-velocity/minecraft-velocity-docker.json b/minecraft-velocity/minecraft-velocity-docker.json index ab417252..60d41797 100644 --- a/minecraft-velocity/minecraft-velocity-docker.json +++ b/minecraft-velocity/minecraft-velocity-docker.json @@ -66,6 +66,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-velocity/minecraft-velocity.json b/minecraft-velocity/minecraft-velocity.json index 57d290e5..546d7701 100644 --- a/minecraft-velocity/minecraft-velocity.json +++ b/minecraft-velocity/minecraft-velocity.json @@ -50,7 +50,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } }, diff --git a/minecraft-waterfall/minecraft-waterfall-docker.json b/minecraft-waterfall/minecraft-waterfall-docker.json index 91a24d9d..eeaae084 100644 --- a/minecraft-waterfall/minecraft-waterfall-docker.json +++ b/minecraft-waterfall/minecraft-waterfall-docker.json @@ -69,6 +69,6 @@ }, "environment": { "type": "docker", - "image": "eclipse-temurin:17" + "image": "eclipse-temurin:21" } } diff --git a/minecraft-waterfall/minecraft-waterfall.json b/minecraft-waterfall/minecraft-waterfall.json index f18648ec..f1977276 100644 --- a/minecraft-waterfall/minecraft-waterfall.json +++ b/minecraft-waterfall/minecraft-waterfall.json @@ -48,7 +48,7 @@ "type": "integer", "desc": "Version of Java to use", "display": "Java Version", - "value": "17", + "value": "21", "required": true } },