Merge pull request #2947 from Multiverse/modrinth-for-promote-release

Upload to modrinth when manually promote release

.github/labeler.yml

@@ -0,0 +1,2 @@
+prerelease:
+  - '*'

.github/workflows/pr_labeler.yml

@@ -0,0 +1,17 @@
+name: "Pull Request Labeler"
+
+on:
+  pull_request_target:
+    types: [opened]
+    branches: [main]
+
+jobs:
+  prerelease_labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v4
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/promote_release.yml

@@ -0,0 +1,108 @@
+name: Manually promote last prerelease to release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to promote'
+        required: true
+      version-bump:
+        description: 'Version bump to apply - should usually match the version bump used for the prerelease since last release'
+        required: true
+        type: choice
+        options:
+          - 'patch'
+          - 'minor'
+          - 'major'
+
+jobs:
+  manually_promote_release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Verify input version is prerelease
+        run: |
+          if [[ "${{ github.event.inputs.version }}" != *"pre"* ]]; then
+              echo "Version must be a prerelease"
+              exit 1
+          fi
+
+      - name: Get release info
+        id: get-release
+        uses: cardinalby/git-get-release-action@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          tag: ${{ github.event.inputs.version }}
+
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ steps.get-release.outputs.tag_name }}
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Remove prerelease tag
+        run: |
+          echo "Removing prerelease tag from version"
+          echo "VERSION=$(echo ${{ steps.get-release.outputs.tag_name }} | sed -E 's/-pre.*//')" >> $GITHUB_ENV
+
+      - name: Build
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: clean build -x test -x checkstyleMain -x checkstyleTest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_VERSION: ${{ env.VERSION }}
+
+      - name: Create release
+        id: release
+        uses: Multiverse/release-on-push-action@skip_prs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          bump_version_scheme: ${{ github.event.inputs.version-bump }}
+          tag_prefix: ''
+          release_name: "<RELEASE_VERSION>"
+          use_github_release_notes: true
+          ref: ${{ steps.get-release.outputs.target_commitish }}
+          skip_prs: true
+
+      - name: Publish package
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_VERSION: ${{ env.VERSION }}
+
+      - name: Upload release artifact
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: build/libs/multiverse-core-${{ env.VERSION }}.jar
+          asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar
+          tag: ${{ steps.release.outputs.tag_name }}
+
+      - name: Get Changelog
+        id: changelog
+        uses: cardinalby/git-get-release-action@1.2.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag: ${{ steps.release.outputs.tag_name }}
+
+      - name: Modrinth Upload
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build modrinth
+        env:
+          GITHUB_VERSION: ${{ env.VERSION }}
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+          CHANGELOG: ${{ steps.changelog.outputs.body }}
+          PRERELEASE: ${{ steps.changelog.outputs.prerelease }}

.github/workflows/release.yml

@@ -28,27 +28,55 @@ jobs:
 
       - name: Create release
         id: release
-        uses: rymndhng/release-on-push-action@v0.27.0
+        uses: Multiverse/release-on-push-action@support_prerelease
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           bump_version_scheme: norelease
           tag_prefix: ''
-          release_name: "Release <RELEASE_VERSION>"
+          release_name: "<RELEASE_VERSION>"
           use_github_release_notes: true
 
+      - name: Modify version scheme
+        run: |
+            if [[ "${{ steps.release.outputs.tag_name }}" == *"pre"* ]]; then
+                echo "Replacing prerelease version scheme with SNAPSHOT"
+                echo "VERSION=$(echo ${{ steps.release.outputs.tag_name }} | sed -E 's/-pre.*/-SNAPSHOT/')" >> $GITHUB_ENV
+            else
+                echo "Using release version scheme"
+                echo "VERSION=${{ steps.release.outputs.tag_name }}" >> $GITHUB_ENV
+            fi
+
       - name: Publish package
         uses: gradle/gradle-build-action@v2
         with:
           arguments: publish
         env:
-          GITHUB_VERSION: ${{ steps.release.outputs.tag_name }}
+          GITHUB_VERSION: ${{ env.VERSION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload release artifact
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: build/libs/multiverse-core-${{ steps.release.outputs.tag_name }}.jar
+          file: build/libs/multiverse-core-${{ env.VERSION }}.jar
           asset_name: multiverse-core-${{ steps.release.outputs.tag_name }}.jar
           tag: ${{ steps.release.outputs.tag_name }}
+
+      - name: Get Changelog
+        id: changelog
+        uses: cardinalby/git-get-release-action@1.2.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag: ${{ steps.release.outputs.tag_name }}
+
+      - name: Modrinth Upload
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build modrinth
+        env:
+          GITHUB_VERSION: ${{ env.VERSION }}
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+          CHANGELOG: ${{ steps.changelog.outputs.body }}
+          PRERELEASE: ${{ steps.changelog.outputs.prerelease }}

.github/workflows/require_label.yml

@@ -15,4 +15,4 @@ jobs:
         with:
           mode: exactly
           count: 1
-          labels: "release:major, release:minor, release:patch, no release"
+          labels: "release:major, release:minor, release:patch, no version bump"

.github/workflows/test.yml

@@ -26,4 +26,11 @@ jobs:
         with:
           arguments: build
         env:
+          GITHUB_VERSION: pr${{ github.event.pull_request.number }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Artifact output
+        uses: actions/upload-artifact@v3
+        with:
+          name: multiverse-core-pr${{ github.event.pull_request.number }}
+          path: build/libs/multiverse-core-pr${{ github.event.pull_request.number }}.jar

README.md

@@ -1,26 +1,31 @@
-![Multiverse 2](config/multiverse2-long.png)
+<p align="center">
+<img src="config/multiverse2-long.png" alt="Multiverse Logo">
+</p>
+
+[![bukkit](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/bukkit_vector.svg)](https://dev.bukkit.org/projects/multiverse-core)
+[![Spigot](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/spigot_vector.svg)](https://www.spigotmc.org/resources/multiverse-core.390/)
 
-[![Maven CI/CD](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml/badge.svg)](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml)
 [![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/Multiverse-Core?label=release&server=https%3A%2F%2Frepo.onarandombox.com%2F)](https://dev.bukkit.org/projects/multiverse-core)
 [![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/Multiverse-Core?label=dev%20builds&server=http%3A%2F%2Frepo.onarandombox.com%2F)](https://ci.onarandombox.com/job/Multiverse-Core/)
 [![Discord](https://img.shields.io/discord/325459248047980545?label=discord&logo=discord)](https://discord.gg/NZtfKky)
-[![Support me on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
+[![Support us on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
 [![License](https://img.shields.io/github/license/Multiverse/Multiverse-Core)](LICENSE.md)
 
-About
-========
+
+# About
+
 [Multiverse](https://dev.bukkit.org/projects/multiverse-core) was created at the dawn of Bukkit multiworld support. It has since then grown into a **complete world management solution!** Multiverse provides the easiest to use world management solution for your Minecraft server, big or small, and with great addons like [Portals](https://dev.bukkit.org/projects/multiverse-portals) and [NetherPortals](https://dev.bukkit.org/projects/multiverse-netherportals/), what's not to love!
-<br><br>
+
 Now it's time to create your very own Multiverse server, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any question or just want to have a chat with us!
 
-### Amazing sub-modules available:
+## Amazing sub-modules available:
+
 * [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
 * [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
 * [Multiverse-Inventories](https://github.com/Multiverse/Multiverse-Inventories) -> Have separated players stats and inventories per world or per group of worlds.
-* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleprompters!
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleporters!
 
-Building
-========
+## Building
 Simply build the source with Gradle:
 ```
 ./gradlew build
@@ -28,17 +33,16 @@ Simply build the source with Gradle:
 More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).
 
 
-Contributing
-=======
+## Contributing
+
 **Want to help improve Multiverse?** There are several ways you can support and contribute to the project.
 * Take a look at our "Bug: Unconfirmed" issues, where you can find issues that need extra testing and investigation.
 * Want others to love Multiverse too? You can join the [Multiverse Discord community](https://discord.gg/NZtfKky) and help others with issues and setup!
 * A Multiverse guru? You can update our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) with your latest tip, tricks and guides! The wiki open for all to edit and improve.
 * Love coding? You could look at ["State: Open to PR"](https://github.com/Multiverse/Multiverse-Core/labels/State%3A%20Open%20to%20PR) and ["Resolution: Accepted"](https://github.com/Multiverse/Multiverse-Core/labels/Resolution%3A%20Accepted) issues. We're always happy to receive bug fixes and feature additions as [pull requests](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github-3/).
-* If you'd like to make a financial contribution to the project, do consider joining our [patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
+* If you'd like to make a financial contribution to the project, do consider joining our [Patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
 
 Additionally, we would like to give a big thanks to everyone that has supported Multiverse over the years, as well as those in the years to come. Thank you!
 
-License
-=======
+## License
 Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info.

build.gradle

@@ -5,6 +5,7 @@ plugins {
     id 'maven-publish'
     id 'checkstyle'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id "com.modrinth.minotaur" version "2.+"
 }
 
 version = System.getenv('GITHUB_VERSION') ?: 'local'
@@ -15,6 +16,8 @@ java.sourceCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenLocal()
+    mavenCentral()
+
     maven {
         url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
     }
@@ -41,9 +44,7 @@ repositories {
 }
 
 dependencies {
-    implementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') {
-        exclude group: 'junit', module: 'junit'
-    }
+    compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
 
     implementation('com.github.MilkBowl:VaultAPI:1.7') {
         exclude group: 'org.bukkit', module: 'bukkit'
@@ -64,6 +65,10 @@ dependencies {
     api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
     api 'org.jetbrains:annotations:16.0.2'
 
+    testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
+    testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
+        exclude group: 'junit', module: 'junit'
+    }
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:3.11.2'
     testImplementation 'commons-io:commons-io:2.4'
@@ -167,7 +172,25 @@ shadowJar {
     configurations = [project.configurations.api]
 
     archiveFileName = "$baseName-$version.$extension"
+    classifier = ''
 }
 
 build.dependsOn shadowJar
 jar.enabled = false
+
+modrinth {
+    token = System.getenv("MODRINTH_TOKEN")
+    projectId = "multiverse-core"
+    versionNumber = version
+
+    if(System.getenv("PRERELEASE")) {
+        versionType = "beta"
+    } else {
+        versionType = "release"
+    }
+
+    uploadFile = jar
+    gameVersions = ["1.20.1", "1.20", "1.19.4", "1.19.3", "1.19.2", "1.19.1", "1.19", "1.18.2", "1.18.1", "1.18", "1.17.1", "1.17", "1.16.5", "1.16.4", "1.16.3", "1.16.2", "1.16.1", "1.16", "1.15.2", "1.15.1", "1.15", "1.14.4", "1.14.3", "1.14.2", "1.14.1", "1.14", "1.13.2", "1.13.1", "1.13"]
+    loaders = ["bukkit", "spigot", "paper"]
+    changelog = System.getenv("CHANGELOG")
+}

settings.gradle

@@ -2,4 +2,10 @@
  * This file was generated by the Gradle 'init' task.
  */
 
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name = 'multiverse-core'