From b116383accc13dd86d889488dc17afbab69fc033 Mon Sep 17 00:00:00 2001 From: JFronny Date: Mon, 30 Sep 2024 19:12:02 +0200 Subject: [PATCH] fix(jfmod): use correct loader on modrinth --- jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts | 2 +- .../main/kotlin/io/gitlab/jfronny/scripts/LoaderKind.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts b/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts index f4d61bb..86deb2e 100644 --- a/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts +++ b/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts @@ -17,7 +17,7 @@ modrinth { changelog.set(project.changelog) uploadFile.set(tasks.remapJar as Any) gameVersions.add(lom.minecraftVersion.get()) - loaders.add("fabric") + loaders.add(args.loaderKind.get().modrinthName) args.modrinth.requiredDependencies.getOrElse(listOf()).forEach { required.project(it) } args.modrinth.optionalDependencies.getOrElse(listOf()).forEach { optional.project(it) } if (readmeFile.exists()) { diff --git a/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LoaderKind.kt b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LoaderKind.kt index 46acc62..4ac0bf5 100644 --- a/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LoaderKind.kt +++ b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LoaderKind.kt @@ -2,10 +2,10 @@ package io.gitlab.jfronny.scripts import java.util.* -enum class LoaderKind(val curseforgeName: String) { - NEOFORGE("NeoForge"), - FORGE("Forge"), - FABRIC("Fabric"); +enum class LoaderKind(val curseforgeName: String, val modrinthName: String) { + NEOFORGE("NeoForge", "neoforge"), + FORGE("Forge", "forge"), + FABRIC("Fabric", "fabric"); companion object { fun fromString(str: String) = valueOf(str.uppercase(Locale.getDefault()))