frogmc/phytotelma
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix mod building
All checks were successful
Publish to snapshot maven / build (push) Successful in 24s
Details

Browse source
This commit is contained in:
moehreag 2024-08-27 20:19:21 +02:00
parent f3d17a60ca
commit 9c3091efe1
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -7,7 +7,7 @@ plugins {
} }
group = "dev.frogmc" group = "dev.frogmc"
version = "0.0.1-alpha.19+local" version = "0.0.1-alpha.19"
repositories { repositories {
maven { maven {

1
src/main/kotlin/dev/frogmc/phytotelma/PhytotelmaPlugin.kt
View file

@ -200,6 +200,7 @@ class PhytotelmaPlugin : Plugin<Project> {
val buildTask = project.tasks.register(Constants.BUILD_TASK, PhytotelmaBuildTask::class.java) val buildTask = project.tasks.register(Constants.BUILD_TASK, PhytotelmaBuildTask::class.java)
project.tasks.getByName(JavaBasePlugin.BUILD_TASK_NAME).dependsOn(buildTask) project.tasks.getByName(JavaBasePlugin.BUILD_TASK_NAME).dependsOn(buildTask)
project.tasks.getByName(JavaPlugin.JAR_TASK_NAME).outputs.upToDateWhen { false }
project.tasks.getByName(JavaPlugin.JAR_TASK_NAME).actions.addLast { task -> project.tasks.getByName(JavaPlugin.JAR_TASK_NAME).actions.addLast { task ->
val storage = ProjectStorage.get(project) val storage = ProjectStorage.get(project)
if (storage.targetNamespace != Constants.MOJMAP_NAMESPACE) { if (storage.targetNamespace != Constants.MOJMAP_NAMESPACE) {

5
src/main/kotlin/dev/frogmc/phytotelma/nest/Nester.kt
View file

@ -109,9 +109,10 @@ object Nester {
FileSystems.newFileSystem(tempFile).use { FileSystems.newFileSystem(tempFile).use {
val matcher = pattern.matcher(version) val matcher = pattern.matcher(version)
matcher.find() matcher.find()
val count = matcher.groupCount()
val semver = matcher.group(1) + val semver = matcher.group(1) +
(if (matcher.group(2) != null) "-" + matcher.group(2) else "") + (if (count > 2) "-" + matcher.group(2) else "") +
(if (matcher.group(3) != null) "+" + matcher.group(3) else "") (if (count > 3) "+" + matcher.group(3) else "")
it.getPath("frog.mod.toml").writeText( it.getPath("frog.mod.toml").writeText(
""" """
[frog] [frog]