diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1e46c5..918d985 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - uses: gradle/wrapper-validation-action@v1 - run: | chmod +x gradlew - ./gradlew build publishUnified --stacktrace -Porg.gradle.parallel.threads=4 + ./gradlew build publishMod --stacktrace -Porg.gradle.parallel.threads=4 env: CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b4cbcc..65a949d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,2 @@ ## Change -- sync malilib 0.18.1 -- not include all masa's mod zh_cn translation +- fix publish diff --git a/build.gradle b/build.gradle index ed8886d..600c44a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,10 @@ +import com.hypherionmc.modpublisher.properties.CurseEnvironment +import com.hypherionmc.modpublisher.properties.ModLoader + plugins { id "dev.architectury.loom" version "1.4-SNAPSHOT" id "maven-publish" - id "me.shedaniel.unified-publishing" version "0.1.+" + id "com.hypherionmc.modutils.modpublisher" version "2.0.+" } sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 @@ -59,32 +62,29 @@ publishing { } } -unifiedPublishing { - project { - displayName = "$project.version" - releaseType = "beta" - changelog = file("CHANGELOG.md").getText('UTF-8') - gameVersions = ["1.20.3", "1.20.4"] - gameLoaders = ["neoforge"] - - mainPublication remapJar - secondaryPublications.builtBy(sourcesJar) - - var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN") - if (CURSEFORGE_TOKEN != null) { - curseforge { - token = CURSEFORGE_TOKEN - id = project.curseforge_id - } - } - - var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN") - if (MODRINTH_TOKEN != null) { - modrinth { - token = MODRINTH_TOKEN - id = project.modrinth_id - version = "$project.version" - } - } +publisher { + apiKeys { + modrinth System.getenv("MODRINTH_TOKEN") + curseforge System.getenv("CURSE_TOKEN") } -} + + setCurseID("${project.curseforge_id}") + setModrinthID("${project.modrinth_id}") + setVersionType("alpha") + setChangelog("CHANGELOG.md") + setVersion("${project.version}") + setDisplayName("${project.version}") + setGameVersions("1.20.3", "1.20.4") + setLoaders(ModLoader.NEOFORGE) + setCurseEnvironment(CurseEnvironment.CLIENT) + setArtifact(remapJar) + addAdditionalFile(sourcesJar) + + modrinthDepends { + required "mafglib" + } + + curseDepends { + required "mafglib" + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3503161..311b418 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loom.platform=neoforge yarn_mappings=1.20.4+build.3 # Mod Properties - mod_version=0.1.2 + mod_version=0.1.3 maven_group=org.thinkingstudio.mafglib archives_base_name=MaFgLib mod_id=mafglib diff --git a/settings.gradle b/settings.gradle index 8b2d19f..abd17bb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { maven { url "https://maven.architectury.dev/" } maven { url "https://maven.neoforged.net/releases/" } maven { url "https://files.minecraftforge.net/maven/" } + maven { url "https://maven.firstdark.dev/releases" } gradlePluginPortal() } }