diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbf9690cf..68352c040 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,14 +1,13 @@ # This workflow will build a Java project with Gradle # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle -name: Build And Publish to Modrinth +name: Build on : [push, pull_request] env: MINECRAFT_VERSION: 1.21.1 VERSION: 1.21.1 - MODRINTH_TOKEN: ${{ secrets.PUBLISH_MODRINTH_TOKEN }} RELEASE_NAME: banner-1.21.1 jobs: @@ -18,7 +17,7 @@ jobs: steps: - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -41,5 +40,5 @@ jobs: - name: Upload API Lib uses: actions/upload-artifact@v4 with: - name: Banner API - path: ./banner-api/build/devlibs/*.jar \ No newline at end of file + name: Banner launcher + path: ./build/libs/*.jar \ No newline at end of file diff --git a/README.md b/README.md index d7da3d2f0..96d55439d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ ### The Bukkit/Spigot/Paper API implementation for Fabric ### The project is no longer a Fabric mod, but a standalone program -[![](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.codemc.io%2Fjob%2FMohistMC%2Fjob%2FBanner-1.21.1&label=Jenkins&logo=jenkins&logoColor=%23ffffff)](https://ci.codemc.io/job/MohistMC/job/Banner-1.21.1) [![](https://img.shields.io/github/stars/MohistMC/Banner.svg?label=Stars&logo=github)](https://github.com/MohistMC/Banner/stargazers) [![](https://img.shields.io/badge/JDK-21.0.3-brightgreen.svg?colorB=469C00&logo=java)](https://www.azul.com/downloads/?version=java-21-lts#zulu) [![](https://img.shields.io/badge/Gradle-8.11.1-brightgreen.svg?colorB=469C00&logo=gradle)](https://docs.gradle.org/8.11.1/release-notes.html) @@ -66,7 +65,6 @@ so don't worried about the plugin files will be changed to unsafe - [**StackDeobfuscator**](https://github.com/booky10/StackDeobfuscator) - auto deobfuscate logger crash ## Special Thanks To: - diff --git a/build.gradle b/build.gradle index 1dc707f1c..560a3f437 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' } -version = project.minecraft_version + "-" + ci_version() +version = project.minecraft_version group = project.maven_group base { @@ -159,7 +159,7 @@ def moduleDependencies(Project project, List depNames) { } def getSubprojectVersion(project) { - return project.minecraft_version + "-" + ci_version() + return project.minecraft_version } dependencies { @@ -180,20 +180,10 @@ jar { 'Main-Class': 'com.mohistmc.banner.BannerLauncher', 'Specification-Title' : 'Banner', 'Specification-Vendor' : 'MohistMC', - 'Specification-Version' : ci_version(), + 'Specification-Version' : version, 'Implementation-Title' : 'Banner', 'Implementation-Version': version, 'Implementation-Vendor' : 'MohistMC' ) } } - -import groovy.json.JsonSlurper -static String ci_version() { - try { - def data = new JsonSlurper().parseText(new URL("https://ci.codemc.io/job/MohistMC/job/Banner-1.21.1/api/json").getText("UTF-8")) - return data.builds["number"][0] - } catch (Exception ignored) { - return "1.21.1" - } -}