Skip to content

Commit 785ea4d

Browse files
committed
Update to Minecraft 26.1, update Gradle to 9.5.0 and Adventure to 5.0.1
1 parent 9806283 commit 785ea4d

12 files changed

Lines changed: 58 additions & 61 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout Repository
9-
uses: actions/checkout@v5
9+
uses: actions/checkout@v6
1010
with:
1111
persist-credentials: false
1212
- name: Set up Gradle
13-
uses: gradle/actions/setup-gradle@v5
14-
- name: Set up JDK 21
13+
uses: gradle/actions/setup-gradle@v6
14+
- name: Set up JDK 25
1515
uses: actions/setup-java@v5
1616
with:
17-
java-version: 21
17+
java-version: 25
1818
distribution: 'temurin'
1919
- name: Build with Gradle
2020
run: ./gradlew build

bootstrap/bukkit/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ dependencies {
77

88
runtimeOnly(libs.slf4j.jdk14)
99
compileOnly(libs.spigot.api)
10+
compileOnly("com.mojang:brigadier:1.0.18")
1011
implementation(libs.adventure.bukkit)
1112
implementation(libs.cloud.paper)
1213
implementation(libs.slf4j)

bootstrap/fabric/build.gradle.kts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("conventions.base")
3-
id("fabric-loom")
3+
id("net.fabricmc.fabric-loom")
44
id("com.gradleup.shadow")
55
}
66

@@ -14,19 +14,18 @@ configurations {
1414

1515
dependencies {
1616
minecraft(libs.minecraft)
17-
mappings(loom.officialMojangMappings())
18-
modImplementation(libs.fabric.loader)
19-
modImplementation(libs.fabric.api)
20-
modImplementation(libs.fabric.permissions.api)
17+
implementation(libs.fabric.loader)
18+
implementation(libs.fabric.api)
19+
implementation(libs.fabric.permissions.api)
2120
include(libs.fabric.permissions.api)
22-
modImplementation(libs.adventure.api)
21+
implementation(libs.adventure.api)
2322
include(libs.adventure.api)
24-
modImplementation(libs.adventure.minimessage)
23+
implementation(libs.adventure.minimessage)
2524
include(libs.adventure.minimessage)
2625
include(libs.adventure.fabric)
27-
modImplementation(libs.adventure.fabric)
26+
implementation(libs.adventure.fabric)
2827
include(libs.cloud.fabric)
29-
modImplementation(libs.cloud.fabric)
28+
implementation(libs.cloud.fabric)
3029
shade(project(mapOf("path" to ":core", "configuration" to "shadow")))
3130
}
3231

@@ -38,9 +37,9 @@ tasks {
3837
mergeServiceFiles()
3938
}
4039

41-
remapJar {
40+
jar {
4241
dependsOn(shadowJar)
43-
inputFile.set(shadowJar.get().archiveFile)
42+
// inputFile.set(shadowJar.get().archiveFile)
4443
archiveClassifier.set("")
4544
archiveVersion.set("")
4645
}

bootstrap/fabric/src/main/resources/fabric.mod.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
},
2121
"mixins": [],
2222
"depends": {
23-
"fabricloader": ">=0.16.14",
23+
"fabricloader": ">=0.18.5",
2424
"fabric-permissions-api-v0": "*",
25-
"minecraft": "~1.21.8",
26-
"java": ">=21",
25+
"minecraft": "~26.1",
26+
"java": ">=25",
2727
"cloud": "*"
2828
}
2929
}

bootstrap/neoforge/src/main/resources/META-INF/neoforge.mods.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ side = "BOTH"
2121
[[dependencies.example_mod]]
2222
modId = "minecraft"
2323
type = "required"
24-
versionRange = "[1.21.8,)"
24+
versionRange = "[26.1,)"
2525
ordering = "NONE"
2626
side = "BOTH"
2727

build-logic/src/main/kotlin/conventions.base.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ configure<SpotlessExtension> {
4949
}
5050
}
5151

52-
java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))
52+
java.toolchain.languageVersion.set(JavaLanguageVersion.of(25))

gradle/libs.versions.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
[versions]
22
# Adventure
3-
adventure = "4.26.1" # https://github.com/PaperMC/adventure
4-
adventure-platform = "4.4.1" # https://github.com/PaperMC/adventure-platform
5-
adventure-platform-mod = "6.8.0" # https://github.com/PaperMC/adventure-platform-mod
3+
adventure = "5.0.1" # https://github.com/PaperMC/adventure
4+
adventure-platform = "4.4.1" # https://github.com/PaperMC/adventure-platform
5+
adventure-platform-mod = "6.9.0" # https://github.com/PaperMC/adventure-platform-mod
66

77
# Cloud
8-
cloud = "2.0.0" # https://github.com/Incendo/cloud
9-
cloud-minecraft = "2.0.0-beta.14" # https://github.com/Incendo/cloud-minecraft
10-
cloud-minecraft-modded = "2.0.0-beta.15" # https://github.com/Incendo/cloud-minecraft-modded
8+
cloud = "2.0.0" # https://github.com/Incendo/cloud
9+
cloud-minecraft = "2.0.0-beta.15" # https://github.com/Incendo/cloud-minecraft
10+
cloud-minecraft-modded = "2.0.0-beta.16" # https://github.com/Incendo/cloud-minecraft-modded
1111

1212
# Server APIs
13-
bungeecord-api = "1.21-R0.1"
14-
spigot-api = "1.21.11-R0.1-SNAPSHOT"
15-
paper-api = "1.21.11-R0.1-SNAPSHOT"
13+
bungeecord-api = "26.1-R0.1-SNAPSHOT"
14+
spigot-api = "26.1.2-R0.1-SNAPSHOT"
15+
paper-api = "26.1.2.build.+"
1616
velocity-api = "3.5.0-SNAPSHOT"
1717

18-
# Modding
19-
minecraft = "1.21.11"
20-
fabric-loader = "0.18.4"
21-
fabric-api = "0.141.3+1.21.11"
22-
fabric-permissions-api = "0.6.1"
23-
neoforge = "21.11.38-beta"
18+
# Mod loader APIs
19+
minecraft = "26.1.2"
20+
fabric-loader = "0.19.2"
21+
fabric-api = "0.146.1+26.1.2"
22+
fabric-permissions-api = "0.7.0"
23+
neoforge = "26.1.2.22-beta"
2424

2525
configurate = "4.2.0-GeyserMC-SNAPSHOT"
2626
slf4j = "2.0.17"
@@ -65,6 +65,6 @@ velocity-api = { group = "com.velocitypowered", name = "velocity-api", version.r
6565

6666
# Gradle Plugins
6767
checkstyle = { group = "com.puppycrawl.tools", name = "checkstyle", version = "13.3.0" }
68-
lombok-plugin = { group = "io.freefair.gradle", name = "lombok-plugin", version = "9.2.0" }
68+
lombok-plugin = { group = "io.freefair.gradle", name = "lombok-plugin", version = "9.4.0" }
6969
shadow-plugin = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version = "9.4.0" }
7070
spotless-plugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version = "8.4.0" }

gradle/wrapper/gradle-wrapper.jar

-504 Bytes
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
79
zipStorePath=wrapper/dists

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)