diff options
| -rw-r--r-- | build.gradle | 56 | ||||
| -rw-r--r-- | forge/build.gradle | 35 | ||||
| -rw-r--r-- | neoforge/build.gradle | 36 |
3 files changed, 52 insertions, 75 deletions
diff --git a/build.gradle b/build.gradle index 43e4b36..cf544a7 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id "net.fabricmc.fabric-loom" version "${loom_version}" id 'maven-publish' id "com.modrinth.minotaur" version "2.+" - id "de.maxhenkel.cursegradle" version "1.+" + id 'net.darkhax.curseforgegradle' version '1.+' } version = project.mod_version @@ -132,43 +132,27 @@ java { // remapJar.inputFile = testJar.outputs.files.singleFile // } //} - -curseforge { - - project { - println("Pushing CurseGradle specifications for project ID: ${curse_id}") - // Specified as cmd argument - apiKey = findProperty('curseKey') ?: 'none' - - id = "${curse_id}" - releaseType = "${version_type}" - changelogType = 'markdown' - changelog = file('docs/CHANGELOG.md') - mainArtifact(jar) - - addGameVersion project.minecraft_version - addGameVersion 'Fabric' - addGameVersion 'Java 25' - - relations { - requiredDependency 'fabric-api' - optionalDependency 'modmenu' - optionalDependency 'cloth-config' - } - - afterEvaluate { - uploadTask.dependsOn(jar) - } - - //debug = true - //addArtifact(sourcesJar) - //addArtifact(apiJar) - } +task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { + println("[Fabric] Pushing CurseForgeGradle specifications for project ID: ${curse_id}") + disableVersionDetection() - options { - forgeGradleIntegration = false - } + apiToken = findProperty('curseKey') ?: '0' + + def projectId = "${curse_id}" + def mainFile = upload(projectId, jar) + + mainFile.changelogType = 'markdown' + mainFile.changelog = rootProject.file("docs/CHANGELOG.md").text + mainFile.releaseType = "${version_type}" + + mainFile.addModLoader('Fabric') + mainFile.addJavaVersion('Java 25') + mainFile.addGameVersion(project.minecraft_version) + + mainFile.addRequirement('fabric-api') + mainFile.addOptional('modmenu') + mainFile.addOptional('cloth-config') } modrinth { diff --git a/forge/build.gradle b/forge/build.gradle index 1b7e7ab..65554ac 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -26,6 +26,7 @@ plugins { id 'maven-publish' id 'net.minecraftforge.gradle' version '[7.0.17,8.0)' id "com.modrinth.minotaur" version "2.+" + id 'net.darkhax.curseforgegradle' version '1.+' } println("Specifying project version/group/archivesBaseName...") @@ -155,26 +156,22 @@ processResources { } } -curseforge { - - project { - println("Pushing CurseGradle specifications for project ID: ${curse_id}") +task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { + println("[Forge] Pushing CurseForgeGradle specifications for project ID: ${curse_id}") + disableVersionDetection() - // Specified as cmd argument - apiKey = findProperty('curseKey') ?: 'none' - - id = "${curse_id}" - releaseType = "${version_type}" - changelogType = 'markdown' - changelog = rootProject.file('docs/CHANGELOG.md') - - addGameVersion project.minecraft_version - addGameVersion "Java 25" - addGameVersion "Forge" - - //addArtifact(sourcesJar) - //addArtifact(apiJar) - } + apiToken = findProperty('curseKey') ?: '0' + + def projectId = "${curse_id}" + def mainFile = upload(projectId, jar) + + mainFile.changelogType = 'markdown' + mainFile.changelog = rootProject.file("docs/CHANGELOG.md").text + mainFile.releaseType = "${version_type}" + + mainFile.addModLoader('Forge') + mainFile.addJavaVersion('Java 25') + mainFile.addGameVersion(project.minecraft_version) } modrinth { diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 8b67d27..43ad04a 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -19,7 +19,7 @@ plugins { id 'idea' id 'maven-publish' id "com.modrinth.minotaur" version "2.+" - id "de.maxhenkel.cursegradle" version "1.+" + id 'net.darkhax.curseforgegradle' version '1.+' id 'net.neoforged.gradle.userdev' version '7.1.21' } @@ -148,26 +148,22 @@ processResources { } } -curseforge { - - project { - println("Pushing CurseGradle specifications for project ID: ${curse_id}") +task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { + println("[NeoForge] Pushing CurseForgeGradle specifications for project ID: ${curse_id}") + disableVersionDetection() - // Specified as cmd argument - apiKey = findProperty('curseKey') ?: 'none' - - id = "${curse_id}" - releaseType = "${version_type}" - changelogType = 'markdown' - changelog = rootProject.file('docs/CHANGELOG.md') - - addGameVersion project.minecraft_version - addGameVersion "Java 25" - addGameVersion "NeoForge" - - //addArtifact(sourcesJar) - //addArtifact(apiJar) - } + apiToken = findProperty('curseKey') ?: '0' + + def projectId = "${curse_id}" + def mainFile = upload(projectId, jar) + + mainFile.changelogType = 'markdown' + mainFile.changelog = rootProject.file("docs/CHANGELOG.md").text + mainFile.releaseType = "${version_type}" + + mainFile.addModLoader('NeoForge') + mainFile.addJavaVersion('Java 25') + mainFile.addGameVersion(project.minecraft_version) } modrinth { |
