Compare commits

...

2 Commits

Author SHA1 Message Date
Johannes Frohnmeyer 5a6154f13e
fix: configure processResources late to avoid using uninitialized state
ci/woodpecker/push/gradle Pipeline was successful Details
ci/woodpecker/push/pages Pipeline was successful Details
2024-04-10 16:36:00 +02:00
Johannes Frohnmeyer f24e6fdd74
fix: detect platform correctly in jfmod 2024-04-10 16:35:22 +02:00
2 changed files with 13 additions and 11 deletions

View File

@ -7,7 +7,7 @@ plugins {
val args = extensions.create<JfModExtension>("jfMod")
// Mirrored from lom.gradle.kts
args.loaderKind = LoaderKind.fromString(prop("jfmod.loader", "fabric"))
args.loaderKind = LoaderKind.fromString(prop("loom.platform", "fabric"))
args.loaderKind.finalizeValue()
legacyCheck(args)

View File

@ -169,17 +169,19 @@ tasks.remapJar {
}
// fill in mod version
tasks.processResources {
val map = mapOf(
"version" to project.versionS,
"minecraft_version" to args.minecraftVersion.get(),
"loader_version" to args.loaderVersion.get(),
"${args.loaderKind.get().name.lowercase()}_version" to args.loaderVersion.get(),
)
filesMatching(listOf("fabric.mod.json", "META-INF/mods.toml")) {
expand(map)
afterEvaluate {
tasks.processResources {
val map = mapOf(
"version" to project.versionS,
"minecraft_version" to args.minecraftVersion.get(),
"loader_version" to args.loaderVersion.get(),
"${args.loaderKind.get().name.lowercase()}_version" to args.loaderVersion.get(),
)
filesMatching(listOf("fabric.mod.json", "META-INF/mods.toml")) {
expand(map)
}
inputs.property("version", project.versionS)
}
inputs.property("version", project.versionS)
}
// publish sources jar and remapped jar without JiJ'd deps