Skip to content

Commit bf07495

Browse files
committed
Initial neoforge 25.1 support, migrate use of deprecated gradle features
1 parent c67d897 commit bf07495

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ hangar = { id = "io.papermc.hangar-publish-plugin", version = "0.1.2" }
4343
loom = { id = "net.fabricmc.fabric-loom", version = "1.15-SNAPSHOT" }
4444
minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }
4545
node-gradle = { id = "com.github.node-gradle.node", version = "7.0.2" }
46-
neoforge-gradle = { id = "net.neoforged.moddev", version = "2.0.107" }
46+
neoforge-gradle = { id = "net.neoforged.moddev", version = "2.0.140" }
4747
shadow = { id = "com.gradleup.shadow", version = "9.1.0" }
4848
sponge-plugin = { id = "org.spongepowered.gradle.plugin", version.ref = "spongegradle" }
4949
sponge-ore = { id = "org.spongepowered.gradle.ore", version.ref = "spongegradle" }

implementations/forge/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ dependencies {
3131
exclude ( group = "com.google.code.gson", module = "gson" )
3232
}
3333

34-
jarJar ( libs.flow.math.get().group, libs.flow.math.get().name , "[${libs.flow.math.get().version},)" )
35-
jarJar ( libs.bluenbt.get().group, libs.bluenbt.get().name , "[${libs.bluenbt.get().version},)" )
34+
jarJar ( "${libs.flow.math.get().group}:${libs.flow.math.get().name}:[${libs.flow.math.get().version},)" )
35+
jarJar ( "${libs.bluenbt.get().group}:${libs.bluenbt.get().name}:[${libs.bluenbt.get().version},)" )
3636

3737
}
3838

implementations/neoforge/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ plugins {
66
}
77

88
val supportedMinecraftVersions = listOf(
9-
"1.21.11"
9+
"26.1-snapshot-1"
1010
)
1111

1212
val minecraftVersion = supportedMinecraftVersions.first()
13-
val neoVersion = "21.11.0-beta"
13+
val neoVersion = "26.1.0.0-alpha.2+snapshot-1"
1414

1515
val shadowInclude: Configuration by configurations.creating
1616
configurations.api.get().extendsFrom(shadowInclude)
@@ -31,8 +31,8 @@ dependencies {
3131
exclude ( group = "com.google.code.gson", module = "gson" )
3232
}
3333

34-
jarJar ( libs.flow.math.get().group, libs.flow.math.get().name , "[${libs.flow.math.get().version},)" )
35-
jarJar ( libs.bluenbt.get().group, libs.bluenbt.get().name , "[${libs.bluenbt.get().version},)" )
34+
jarJar ( "${libs.flow.math.get().group}:${libs.flow.math.get().name}:[${libs.flow.math.get().version},)" )
35+
jarJar ( "${libs.bluenbt.get().group}:${libs.bluenbt.get().name}:[${libs.bluenbt.get().version},)" )
3636
}
3737

3838
tasks.shadowJar {
@@ -84,7 +84,7 @@ tasks.withType(ProcessResources::class).configureEach {
8484
)) { expand(replacements) }
8585
}
8686

87-
val mergeShadowAndJarJar = tasks.create<Jar>("mergeShadowAndJarJar") {
87+
val mergeShadowAndJarJar = tasks.register<Jar>("mergeShadowAndJarJar") {
8888
dependsOn( tasks.shadowJar, tasks.jarJar )
8989
from (
9090
zipTree( tasks.shadowJar.map { it.outputs.files.singleFile } ),
@@ -97,7 +97,7 @@ val mergeShadowAndJarJar = tasks.create<Jar>("mergeShadowAndJarJar") {
9797

9898
tasks.getByName<CopyFileTask>("release") {
9999
dependsOn( mergeShadowAndJarJar )
100-
inputFile = mergeShadowAndJarJar.outputs.files.singleFile
100+
inputFile = mergeShadowAndJarJar.get().outputs.files.singleFile
101101
}
102102

103103
modrinth {

implementations/paper/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
exclude( group = "net.kyori", module = "adventure-api" )
1919
}
2020

21-
shadow ( "io.papermc.paper", "paper-api", paperVersion )
21+
shadow ("io.papermc.paper:paper-api:$paperVersion")
2222
api ( libs.bstats.bukkit )
2323
api ( libs.bluecommands.brigadier ) {
2424
exclude ( group = "com.mojang", module = "brigadier" )

implementations/spigot/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
exclude ( group = "com.google.code.gson", module = "gson" )
2121
}
2222

23-
shadow ( "org.spigotmc", "spigot-api", spigotVersion )
23+
shadow ( "org.spigotmc:spigot-api:$spigotVersion" )
2424
api ( libs.bstats.bukkit )
2525
}
2626

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include(":common")
2525
implementation("cli")
2626
implementation("fabric")
2727
//implementation("forge")
28-
//implementation("neoforge")
28+
implementation("neoforge")
2929
implementation("paper")
3030
implementation("spigot")
3131
implementation("sponge")

0 commit comments

Comments
 (0)