Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion minecraft-autoplug/minecraft-autoplug-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-autoplug/minecraft-autoplug.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"desc": "Version of Java to use",
"display": "Java Version",
"required": true,
"value": "17"
"value": "21"
}
},
"install": [
Expand Down
2 changes: 1 addition & 1 deletion minecraft-bungeecord/minecraft-bungeecord-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-bungeecord/minecraft-bungeecord.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion minecraft-fabric/minecraft-fabric-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-fabric/minecraft-fabric.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
Expand Down
2 changes: 1 addition & 1 deletion minecraft-forge-legacy/minecraft-forge-legacy-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@
"type": "docker",
"image": "eclipse-temurin:8"
}
}
}
2 changes: 1 addition & 1 deletion minecraft-forge-legacy/minecraft-forge-legacy.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@
"environment": {
"type": "standard"
}
}
}
2 changes: 1 addition & 1 deletion minecraft-forge/minecraft-forge-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-forge/minecraft-forge.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"internal": false
},
"javaversion": {
"value": "17",
"value": "21",
"required": true,
"desc": "Version of Java to use",
"display": "Java Version"
Expand Down
2 changes: 1 addition & 1 deletion minecraft-ftb-fabric/minecraft-ftb-fabric.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
},
"memory": {
Expand Down
2 changes: 1 addition & 1 deletion minecraft-ftb/minecraft-ftb-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
},
"requirements": {
"os": "linux",
Expand Down
2 changes: 1 addition & 1 deletion minecraft-ftb/minecraft-ftb.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"value": ""
},
"javaversion": {
"value": "17",
"value": "21",
"required": true,
"desc": "Version of Java to use",
"display": "Java Version"
Expand Down
2 changes: 1 addition & 1 deletion minecraft-magma/minecraft-magma-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-magma/minecraft-magma.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
14 changes: 7 additions & 7 deletions minecraft-modpack-gtnh/minecraft-modpack-gtnh-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
},
Expand All @@ -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"
}
Expand All @@ -56,10 +56,10 @@
},
"gtnh-ver": {
"type": "string",
"desc": "May be located <a href='http://downloads.gtnewhorizons.com/ServerPacks/'>here</a>. E.g. \"2.2.9\" or \"2.3.0-RC-3\".",
"desc": "May be located <a href='http://downloads.gtnewhorizons.com/ServerPacks/'>here</a>. 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",
Expand Down Expand Up @@ -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": {
Expand Down
14 changes: 7 additions & 7 deletions minecraft-modpack-gtnh/minecraft-modpack-gtnh.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
},
Expand All @@ -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": [],
Expand All @@ -60,10 +60,10 @@
},
"gtnh-ver": {
"type": "string",
"desc": "May be located <a href='http://downloads.gtnewhorizons.com/ServerPacks/'>here</a>. E.g. \"2.2.9\" or \"2.3.0-RC-3\".",
"desc": "May be located <a href='http://downloads.gtnewhorizons.com/ServerPacks/'>here</a>. 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",
Expand Down
2 changes: 1 addition & 1 deletion minecraft-mohist/minecraft-mohist-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-mohist/minecraft-mohist.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion minecraft-paper/minecraft-paper-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-paper/minecraft-paper.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion minecraft-purpur/minecraft-purpur-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-purpur/minecraft-purpur.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion minecraft-quilt/minecraft-quilt.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion minecraft-spigot/minecraft-spigot-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
4 changes: 2 additions & 2 deletions minecraft-spigot/minecraft-spigot.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand All @@ -67,7 +67,7 @@
{
"type": "command",
"commands": [
"java17 -jar BuildTools.jar --rev ${version}"
"java21 -jar BuildTools.jar --rev ${version}"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion minecraft-vanilla/minecraft-vanilla-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-vanilla/minecraft-vanilla.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion minecraft-velocity/minecraft-velocity-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-velocity/minecraft-velocity.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion minecraft-waterfall/minecraft-waterfall-docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@
},
"environment": {
"type": "docker",
"image": "eclipse-temurin:17"
"image": "eclipse-temurin:21"
}
}
2 changes: 1 addition & 1 deletion minecraft-waterfall/minecraft-waterfall.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"type": "integer",
"desc": "Version of Java to use",
"display": "Java Version",
"value": "17",
"value": "21",
"required": true
}
},
Expand Down
Loading