@@ -610,8 +610,14 @@ if (System.getenv('CURSEFORGE_KEY') != null || project.hasProperty('curseforgeKe
610610
611611 def changelog = outputChangelog. flatMap(c -> c. outputFile)
612612 inputs. file(changelog)
613+ inputs. property(' release_type' , release_type)
614+ inputs. property(' java_version' , java_version)
615+ inputs. property(' minecraft_version' , minecraft_version)
613616
617+ // debugMode.set(true)
618+ disableVersionDetection()
614619 apiToken = System . getenv(' CURSEFORGE_KEY' ) ?: project. findProperty(' curseforgeKey' )
620+ // apiToken.set(project.providers.environmentVariable('CURSEFORGE_KEY').orElse(project.providers.gradleProperty('curseforgeKey')))
615621
616622 // Main Mekanism Project
617623 def mainCfUpload = task. upload(268560 , jar) { main ->
@@ -645,18 +651,26 @@ if (System.getenv('CURSEFORGE_KEY') != null || project.hasProperty('curseforgeKe
645651 doLast {
646652 // Note: Quiet is the level above warning but below error. We want these to show regardless of logging level
647653 // see: https://docs.gradle.org/current/userguide/logging.html
648- logger. quiet(' https://www.curseforge.com/minecraft/mc-mods/mekanism/files/{}' , mainCfUpload. curseFileId)
649- logger. quiet(' https://www.curseforge.com/minecraft/mc-mods/mekanism-additions/files/{}' , additionsCfUpload. curseFileId)
650- logger. quiet(' https://www.curseforge.com/minecraft/mc-mods/mekanism-generators/files/{}' , generatorsCfUpload. curseFileId)
651- logger. quiet(' https://www.curseforge.com/minecraft/mc-mods/mekanism-tools/files/{}' , toolsCfUpload. curseFileId)
654+ // Note: We cast to object to be explicit, so that when we have CurseForgeGradle in debug mode and these are null
655+ // then it can resolve which overload to use
656+ logger. quiet(' https://www.curseforge.com/minecraft/mc-mods/mekanism/files/{}' , (Object ) mainCfUpload. curseFileId)
657+ logger. quiet(' https://www.curseforge.com/minecraft/mc-mods/mekanism-additions/files/{}' , (Object ) additionsCfUpload. curseFileId)
658+ logger. quiet(' https://www.curseforge.com/minecraft/mc-mods/mekanism-generators/files/{}' , (Object ) generatorsCfUpload. curseFileId)
659+ logger. quiet(' https://www.curseforge.com/minecraft/mc-mods/mekanism-tools/files/{}' , (Object ) toolsCfUpload. curseFileId)
652660 }
653661 })
654662}
655663
656664void setGenericCurseArtifactData (UploadArtifact artifact , Provider<RegularFile > changelog ) {
657665 artifact. changelog = changelog
658666 artifact. changelogType = ' markdown'
659- artifact. releaseType = " ${ release_type} "
667+ artifact. releaseType = release_type
668+ // artifact.changelog.set(changelog.map(file -> file.asFile.text))
669+ // artifact.changelogType.set('markdown')
670+ // artifact.releaseType.set(release_type)
671+ artifact. addModLoader(' NeoForge' )
672+ artifact. addJavaVersion(" Java ${ java_version} " )
673+ artifact. addGameVersion(minecraft_version)
660674}
661675
662676UploadArtifact uploadSecondaryCurseProject (TaskPublishCurseForge task , long projectId , Provider<RegularFile > changelog , TaskProvider<Jar > sourceSetJar ) {
0 commit comments