diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2fb9a3a..4c321c9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,4 +22,8 @@ jobs: CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }} run: | chmod a+x ./gradlew - ./gradlew curseforge \ No newline at end of file + ./gradlew curseforge + - uses: actions/upload-artifact@v3 + with: + name: output-jar + path: ${{ github.workspace }}/build/libs/*.jar \ No newline at end of file diff --git a/build.gradle b/build.gradle index f89a013..0309538 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply plugin: "com.modrinth.minotaur" apply from: 'https://raw.githubusercontent.com/thedarkcolour/KotlinForForge/site/thedarkcolour/kotlinforforge/gradle/kff-3.3.2.gradle' group = 'com.bloxgaming' -version = '1.2.2' +version = '1.2.3' archivesBaseName = 'tagfoods' java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -36,44 +36,6 @@ mixin { add sourceSets.main, "tagfoods.refmap.json" } -curseforge { - apiKey = System.getenv("CURSEFORGE_API_KEY") ?: "no-api-key" - project { - id = '504465' - changelogType = 'markdown' - changelog = file('changes.md') - releaseType = 'release' - addGameVersion '1.18.2' - - mainArtifact(jar) { - displayName = "TagFoods v$project.version" - releaseType = 'release' - relations { - requiredDependency 'kotlin-for-forge' - optionalDependency 'jei' - } - } - } - options { - detectNewerJava = true - forgeGradleIntegration = true - } -} - -modrinth { - token = System.getenv("MODRINTH_TOKEN") ?: "no-modrinth-token" - projectId = "AHIqijE1" - versionNumber = "$project.version" - versionName = "TagFoods v$project.version" - versionType = "release" - uploadFile = jar - gameVersions = ['1.18.2'] - changelog = file('changes.md').text - dependencies { - required.project("ordsPcFz") - } -} - minecraft { // The mappings can be changed at any time, and must be in the following format. // Channel: Version: @@ -193,6 +155,7 @@ dependencies { // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. minecraft 'net.minecraftforge:forge:1.18.2-40.1.25' + annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" @@ -214,8 +177,12 @@ dependencies { //Add JEI to allow search by tags at runtime runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") +} - annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' +// Workaround for SpongePowered/MixinGradle#38 +afterEvaluate { + tasks.configureReobfTaskForReobfJar.mustRunAfter(tasks.compileJava) + tasks.configureReobfTaskForReobfJarJar.mustRunAfter(tasks.compileJava) } // Example for how to get properties into the manifest for reading by the runtime.. @@ -237,3 +204,41 @@ jar { } jar.finalizedBy('reobfJar') + +curseforge { + apiKey = System.getenv("CURSEFORGE_API_KEY") ?: "no-api-key" + project { + id = '504465' + changelogType = 'markdown' + changelog = file('changes.md') + releaseType = 'release' + addGameVersion '1.18.2' + + mainArtifact(jar) { + displayName = "TagFoods v$project.version" + releaseType = 'release' + relations { + requiredDependency 'kotlin-for-forge' + optionalDependency 'jei' + } + } + } + options { + detectNewerJava = true + forgeGradleIntegration = true + } +} + +modrinth { + token = System.getenv("MODRINTH_TOKEN") ?: "no-modrinth-token" + projectId = "AHIqijE1" + versionNumber = "$project.version" + versionName = "TagFoods v$project.version" + versionType = "release" + uploadFile = jar + gameVersions = ['1.18.2'] + changelog = file('changes.md').text + dependencies { + required.project("ordsPcFz") + } +} diff --git a/changes.md b/changes.md index 8c23739..abe412a 100644 --- a/changes.md +++ b/changes.md @@ -1,3 +1,3 @@ -Version 1.2.2: +Version 1.2.3: -* Fix for broken jar on CurseForge \ No newline at end of file +* Fix jar not being obfuscated due to Gradle issues \ No newline at end of file