diff --git a/build.gradle b/build.gradle index c7ca2fd8..d9bc5666 100644 --- a/build.gradle +++ b/build.gradle @@ -123,25 +123,6 @@ subprojects { } } -/* - modCompileOnly("mezz.jei:jei-${minecraft_version}:${jei_version}") - //modRuntimeOnly("mezz.jei:jei-${minecraft_version}:${jei_version}") - - modCompileOnly("curse.maven:refinedstorage-243076:${refined_storage_version}") - - // compile against the JEI API but do not include it at runtime - modCompileOnly("mezz.jei:jei-${minecraft_version}-forge:${jei_version}") - - modCompileOnly("curse.maven:jeresources-240630:3951643") - modCompileOnly "me.shedaniel:RoughlyEnoughItems-forge:${rei_version}" - modCompileOnly("dev.latvian.mods:kubejs-forge:${kubejs_version}") - modRuntimeOnly("curse.maven:ferritecore-429235:4117906") - modCompileOnly("team.chisel.ctm:CTM:${ctm_version}") - modCompileOnly("curse.maven:supermartijncore-454372:4455391") - modCompileOnly("appeng:appliedenergistics2-forge:12.9.4") - modCompileOnly("vazkii.patchouli:Patchouli:1.19.2-77") -*/ - tasks.withType(JavaCompile) { // ensure that the encoding is set to UTF-8, no matter what the system default is // this fixes some edge cases with special characters not displaying correctly @@ -176,32 +157,6 @@ task generateChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTas toCommit = "HEAD"; } -/* -curseforge { - if (System.getenv("CURSEFORGE_TOKEN") != null) { - apiKey = System.getenv("CURSEFORGE_TOKEN") - project { - id = "790626" - changelog = file('./CHANGELOG.md') - changelogType = "markdown" - releaseType = "release" - addGameVersion "Forge" - addGameVersion minecraft_version - mainArtifact remapJar - } - } -} - -modrinth { - token = System.getenv("MODRINTH_TOKEN") - projectId = "modernfix" // This can be the project ID or the slug. Either will work! - versionType = "release" // This is the default -- can also be `beta` or `alpha` - uploadFile = remapJar - gameVersions = [minecraft_version] - loaders = ["forge"] - changelog.set(provider { file("./CHANGELOG.md").getText('UTF-8') }) -} - tasks.register('checkCleanTag') { doLast { def details = versionDetails() @@ -209,15 +164,4 @@ tasks.register('checkCleanTag') { throw new GradleException('Not a clean tree.') } } -} - -tasks.curseforge.dependsOn(":checkCleanTag") -tasks.curseforge.dependsOn(":generateChangelog") -tasks.modrinth.dependsOn(":checkCleanTag") -tasks.modrinth.dependsOn(":generateChangelog") - -tasks.register('publishToModSites') { - publishToModSites.dependsOn(tasks.modrinth) - publishToModSites.dependsOn(tasks.curseforge) -} - */ \ No newline at end of file +} \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index f163ff3f..34557ed3 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -102,7 +102,7 @@ curseforge { id = "790626" changelog = file('../CHANGELOG.md') changelogType = "markdown" - releaseType = "release" + releaseType = "beta" addGameVersion "Fabric" addGameVersion minecraft_version mainArtifact remapJar @@ -113,7 +113,7 @@ curseforge { modrinth { token = System.getenv("MODRINTH_TOKEN") projectId = "modernfix" // This can be the project ID or the slug. Either will work! - versionType = "release" // This is the default -- can also be `beta` or `alpha` + versionType = "beta" // This is the default -- can also be `beta` or `alpha` uploadFile = remapJar gameVersions = [minecraft_version] loaders = ["fabric"] @@ -121,4 +121,9 @@ modrinth { } tasks.curseforge.dependsOn(rootProject.generateChangelog) -tasks.modrinth.dependsOn(rootProject.generateChangelog) \ No newline at end of file +tasks.modrinth.dependsOn(rootProject.generateChangelog) + +tasks.register('publishToModSites') { + publishToModSites.dependsOn(tasks.modrinth) + publishToModSites.dependsOn(tasks.curseforge) +} \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index 0d53bc2c..1a985834 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -149,3 +149,8 @@ modrinth { tasks.curseforge.dependsOn(rootProject.generateChangelog) tasks.modrinth.dependsOn(rootProject.generateChangelog) + +tasks.register('publishToModSites') { + publishToModSites.dependsOn(tasks.modrinth) + publishToModSites.dependsOn(tasks.curseforge) +} \ No newline at end of file diff --git a/release.sh b/release.sh index 092d47c8..38af5f96 100755 --- a/release.sh +++ b/release.sh @@ -6,4 +6,4 @@ read newtag git tag -a $newtag -m "$newtag" git push git push --tags -./gradlew publishToModSites +./gradlew fabric:publishToModSites forge:publishToModSites