Skip to content
Draft
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
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ body:
attributes:
label: Steps to reproduce
description: |
What do we need to do in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner.
What do we need to do in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner.
placeholder: Steps to reproduce
validations:
required: true
Expand All @@ -40,9 +40,9 @@ body:
id: server-info
attributes:
label: Server Info
description: "Minecraft version: (e.g. 1.21.4), Server version (e.g. Spigot, Paper), Plugin version (e.g. 2.17.1)"
description: "Minecraft version: (e.g. 26.1), Server version (e.g. Spigot, Paper), Plugin version (e.g. 3.0.0)"
render: shell
placeholder: "Minecraft version 1.21.4 on the server version Paper-386 with the Plugin version 2.17.1"
placeholder: "Minecraft version 26.1 on the server version Paper-386 with the Plugin version 3.0.0"
validations:
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 21 ]
java: [ 25 ]
fail-fast: true

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 21 ]
java: [ 25 ]
fail-fast: true
steps:
- name: Checkout Git Repository
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ dependencies {

## Contributing

Build requires **Java 25**.

### To compile...

#### On Windows
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ dependencies {

kotlin {
jvmToolchain {
this.languageVersion.set(JavaLanguageVersion.of(21))
this.languageVersion.set(JavaLanguageVersion.of(25))
}
}
4 changes: 3 additions & 1 deletion buildSrc/src/main/kotlin/CommonConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import org.gradle.kotlin.dsl.withType
fun Project.applyCommonConfiguration() {
group = rootProject.group
version = rootProject.version
val javaVersion = providers.gradleProperty("javaVersion").orElse("25").get().toInt()

repositories {
mavenCentral()
Expand All @@ -30,12 +31,13 @@ fun Project.applyCommonConfiguration() {
plugins.withId("java") {
the<JavaPluginExtension>().apply {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
languageVersion.set(JavaLanguageVersion.of(javaVersion))
}
}
}

tasks.withType<JavaCompile> {
options.encoding = Charsets.UTF_8.name()
options.release.set(javaVersion)
}
}
6 changes: 3 additions & 3 deletions buildsystem-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ tasks.withType<Javadoc> {
opt.overview("javadoc/overview.html")
opt.encoding("UTF-8")
opt.charSet("UTF-8")
opt.links("https://docs.oracle.com/en/java/javase/21/docs/api/")
opt.links("https://docs.oracle.com/en/java/javase/25/docs/api/")
opt.links("https://hub.spigotmc.org/javadocs/spigot/")
opt.links("https://javadoc.io/static/org.jetbrains/annotations/")
opt.links("https://javadoc.io/doc/org.jspecify/jspecify")
opt.links("https://javadoc.io/doc/org.jetbrains/annotations/26.1.0/")
opt.links("https://javadoc.io/doc/org.jspecify/jspecify/1.0.0/")
opt.isLinkSource = true
opt.isUse = true
opt.keyWords()
Expand Down
4 changes: 2 additions & 2 deletions buildsystem-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ repositories {
}
modrinthMavenWorkaround(
"axiom-paper-plugin",
"5.0.2+1.21.10",
"AxiomPaper-5.0.2-for-MC1.21.10.jar"
"5.0.4+26.1",
"AxiomPaperPlugin-5.0.4-for-MC26.1.jar"
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ public static class Default {
* Default game rules for new worlds.
*/
public static List<GameRuleEntry<?>> gameRules = List.of(
new GameRuleEntry<>(GameRule.DO_DAYLIGHT_CYCLE, false),
new GameRuleEntry<>(GameRule.DO_MOB_SPAWNING, false),
new GameRuleEntry<>(GameRule.DO_FIRE_TICK, false)
new GameRuleEntry<>(GameRule.ADVANCE_TIME, false),
new GameRuleEntry<>(GameRule.SPAWN_MOBS, false),
new GameRuleEntry<>(GameRule.FIRE_SPREAD_RADIUS_AROUND_PLAYER, 0)
);

/**
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[versions]
# Platform expectations
spigot = "1.21.8-R0.1-SNAPSHOT"
spigot = "26.1.2-R0.1-SNAPSHOT"
paperlib = "1.0.8"

# Plugins
luckperms = "5.5"
worldedit = "7.4.2"
placeholderapi = "2.12.2"
axiompaper = "4.0.1-1.21.1"
axiompaper = "5.0.4+26.1"
# Third Party
annotations = "26.1.0"
authlib = "3.13.56"
Expand Down