From a9155d171ae6659f7eda24053c33c6ffebeaa72e Mon Sep 17 00:00:00 2001 From: Aizistral Date: Tue, 18 Aug 2026 11:19:09 +0200 Subject: Revert "Use Darkhax CurseGradle plugin" This reverts commit b6dfadbc0744ce236f6800a320434f110c110e9c. --- build.gradle | 60 +++++++++++++++++++++++++++++++++--------------------- forge/build.gradle | 43 ++++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 43 deletions(-) diff --git a/build.gradle b/build.gradle index 645c859..3d369ac 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' id "com.modrinth.minotaur" version "2.+" - id 'net.darkhax.curseforgegradle' version '1.+' + id "com.matthewprenger.cursegradle" version "1.+" } sourceCompatibility = JavaVersion.VERSION_17 @@ -138,30 +138,44 @@ java { // } //} -task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { - println("[Fabric] Pushing CurseForgeGradle specifications for project ID: ${curse_id}") - disableVersionDetection() - - apiToken = findProperty('curseKey') ?: '0' - - def projectId = project.curse_id - def mainFile = upload(projectId, remapJar) - - mainFile.changelogType = 'markdown' - mainFile.changelog = rootProject.file("docs/CHANGELOG.md").text - mainFile.releaseType = "${version_type}" - - mainFile.addEnvironment("Client", "Server") +curseforge { + + project { + println("Pushing CurseGradle specifications for project ID: ${curse_id}") - mainFile.addModLoader('Quilt') - mainFile.addModLoader('Fabric') - mainFile.addJavaVersion('Java 17') - mainFile.addGameVersion('1.20') - mainFile.addGameVersion('1.20.1') + // Specified as cmd argument + apiKey = findProperty('curseKey') ?: 'none' + + id = "${curse_id}" + releaseType = "${version_type}" + changelogType = 'markdown' + changelog = file('docs/CHANGELOG.md') + mainArtifact(remapJar) + + addGameVersion "1.20.1" + addGameVersion "1.20" + addGameVersion 'Quilt' + addGameVersion 'Fabric' + addGameVersion 'Java 17' + + relations { + embeddedLibrary 'fabric-api' + optionalDependency 'modmenu' + optionalDependency 'cloth-config' + } + + afterEvaluate { + uploadTask.dependsOn(remapJar) + } + + //debug = true + //addArtifact(sourcesJar) + //addArtifact(apiJar) + } - mainFile.addEmbedded('fabric-api') - mainFile.addOptional('modmenu') - mainFile.addOptional('cloth-config') + options { + forgeGradleIntegration = false + } } modrinth { diff --git a/forge/build.gradle b/forge/build.gradle index 6ffc6f1..1a4511d 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -13,19 +13,19 @@ buildscript { name "Gradle Plugin Portal" url 'https://plugins.gradle.org/m2/' content { + includeGroup "gradle.plugin.com.matthewprenger" includeGroup "com.modrinth" - includeGroup "net.darkhax" } } } dependencies { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' classpath 'org.spongepowered:mixingradle:0.7.+' } } plugins { - id 'net.darkhax.curseforgegradle' version '1.+' id "com.modrinth.minotaur" version "2.+" } @@ -36,6 +36,7 @@ apply plugin: 'org.spongepowered.mixin' apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'maven-publish' +apply plugin: 'com.matthewprenger.cursegradle' apply from: '../common.gradle' @@ -179,25 +180,27 @@ processResources { } } -task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { - println("[Forge] Pushing CurseForgeGradle specifications for project ID: ${curse_id}") - disableVersionDetection() - - apiToken = findProperty('curseKey') ?: '0' - - def projectId = project.curse_id - def mainFile = upload(projectId, jar) - - mainFile.changelogType = 'markdown' - mainFile.changelog = rootProject.file("docs/CHANGELOG.md").text - mainFile.releaseType = "${version_type}" - - mainFile.addEnvironment("Client", "Server") +curseforge { + + project { + println("Pushing CurseGradle specifications for project ID: ${curse_id}") - mainFile.addModLoader('Forge') - mainFile.addJavaVersion('Java 17') - mainFile.addGameVersion('1.20') - mainFile.addGameVersion('1.20.1') + // Specified as cmd argument + apiKey = findProperty('curseKey') ?: 'none' + + id = "${curse_id}" + releaseType = "${version_type}" + changelogType = 'markdown' + changelog = rootProject.file('docs/CHANGELOG.md') + + addGameVersion "1.20.1" + addGameVersion "1.20" + addGameVersion "Java 17" + addGameVersion "Forge" + + //addArtifact(sourcesJar) + //addArtifact(apiJar) + } } modrinth { -- cgit v1.2.3