diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5f3848c9..dc478189 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Remove tags for release on other versions run: ./scripts/tagcleaner.sh - name: Build and publish mod to CurseForge & Modrinth - run: ./gradlew publishToModSites copyJarToBin + run: ./gradlew publishMods copyJarToBin env: CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} diff --git a/build.gradle.kts b/build.gradle.kts index 7dd6fedc..c85fb4cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,6 +2,7 @@ plugins { id("net.neoforged.moddev") version("2.0.134") id("org.ajoberstar.grgit") version("5.2.0") id("com.palantir.git-version") version("1.0.0") + id("me.modmuss50.mod-publish-plugin") version("1.1.0") } val minecraft_version = rootProject.properties["minecraft_version"].toString() @@ -198,4 +199,28 @@ tasks.register("copyJarToBin") { tasks.named("build") { dependsOn("copyJarToBin", "copyJarNameConsistent") +} + +publishMods { + file.set(tasks.named(finalJarTask).get().outputs.files.singleFile) + changelog = "Please check the [GitHub wiki](https://github.com/embeddedt/ModernFix/wiki/Changelog) for major changes." + type = STABLE + + modLoaders.add("neoforge") + + curseforge { + projectId = "790626" + projectSlug = "modernfix" + accessToken = providers.environmentVariable("CURSEFORGE_TOKEN") + minecraftVersions.add(minecraft_version) + } + modrinth { + projectId = "modernfix" + accessToken = providers.environmentVariable("MODRINTH_TOKEN") + minecraftVersions.add(minecraft_version) + } +} + +tasks.named("publishMods") { + dependsOn(finalJarTask) } \ No newline at end of file diff --git a/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index 512af3a1..c757ad99 100644 --- a/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -314,16 +314,16 @@ public class ModernFixEarlyConfig { } private void readGlobalProperties() { - Path minecraftFolder; - if (SystemUtils.IS_OS_MAC) { - minecraftFolder = Paths.get(System.getProperty("user.home"), "Library", "Application Support", "minecraft"); - } else if (SystemUtils.IS_OS_WINDOWS) { - minecraftFolder = Paths.get(System.getenv("APPDATA"), ".minecraft"); - } else { - minecraftFolder = Paths.get(System.getProperty("user.home"), ".minecraft"); - } - Path globalPropsFile = minecraftFolder.resolve("global").resolve("modernfix-global-mixins.properties"); try { + Path minecraftFolder; + if (SystemUtils.IS_OS_MAC) { + minecraftFolder = Paths.get(System.getProperty("user.home"), "Library", "Application Support", "minecraft"); + } else if (SystemUtils.IS_OS_WINDOWS) { + minecraftFolder = Paths.get(System.getenv("APPDATA"), ".minecraft"); + } else { + minecraftFolder = Paths.get(System.getProperty("user.home"), ".minecraft"); + } + Path globalPropsFile = minecraftFolder.resolve("global").resolve("modernfix-global-mixins.properties"); if (Files.exists(globalPropsFile)) { Properties properties = new Properties(); try (var is = Files.newInputStream(globalPropsFile)) {