Merge branch 'master' into ocean-generator-&-others

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,66 @@
+name: Bug Report
+description: Create a report to help us improve IridiumSkyblock!
+labels: ["bug", "unconfirmed"]
+assignees: ["PeachesMLG", "dlsf", "sh0inx"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: markdown
+    attributes:
+      value: Before submitting a new issue, ensure your bug hasn't already been reported. If it has, reply to the open issue instead.
+  - type: textarea
+    id: reproduction
+    validations:
+      required: true
+    attributes:
+      label: Steps to Reproduce
+      description: Provide clear and unambiguous steps on how to reproduce the bug
+      placeholder: |
+        1. Do this
+        2. Click on this
+        3. See error
+  - type: textarea
+    id: expected_behavior
+    validations:
+      required: true
+    attributes:
+      label: Expected Behavior
+      description: Describe what you expected to happen
+  - type: textarea
+    id: actual_behavior
+    validations:
+      required: true
+    attributes:
+      label: Actual Behavior
+      description: Describe what actually happened
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Optionally, add some screenshots to show the issue
+  - type: input
+    id: minecraft_version
+    validations:
+      required: true
+    attributes:
+      label: Server Software & Minecraft Version
+      description: Please copy and paste the output of `/version`, "latest" is not helpful
+  - type: input
+    id: skyblock_version
+    validations:
+      required: true
+    attributes:
+      label: IridiumSkyblock version
+      description: Please copy and paste the output of `/is version`, "latest" is not helpful
+  - type: input
+    id: logs
+    attributes:
+      label: Server logs
+      description: "If there are error messages in your console, please send them via [this](https://mclo.gs)"
+  - type: textarea
+    id: additional_comments
+    attributes:
+      label: Additional Comments
+      description: Optionally, add further comments which may enhance the issue

.github/workflows/gradle-build.yml

@@ -0,0 +1,32 @@
+# 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
+#
+# This worflow will also upload an artifact to Nexus, Hangar, Modrinth, and GitHub releases.
+
+name: Java CI with Gradle
+on: [ push ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.commits[0].message, '[ci-skip]')"
+    steps:
+      - uses: actions/[email protected]
+      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up JDK 17
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Test with Gradle
+        run: ./gradlew test
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Upload artifacts
+        uses: "actions/[email protected]"
+        with:
+          name: "IridiumSkyblock"
+          path: "build/libs/IridiumSkyblock-*.jar"

.github/workflows/publish.yml

@@ -0,0 +1,162 @@
+name: Publish Artifacts
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up JDK 17
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Test with Gradle
+        run: ./gradlew test
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Upload artifacts
+        uses: "actions/[email protected]"
+        with:
+          name: "IridiumSkyblock"
+          path: "build/libs/IridiumSkyblock-*.jar"
+
+  update-release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Downloading artifact
+        uses: actions/checkout@v2
+      - uses: thecodemonkey/action-get-gradle-version@master
+        id: version
+        with:
+          file: "build.gradle.kts"
+      - uses: actions/[email protected]
+        with:
+          name: "IridiumSkyblock"
+          path: "./"
+
+      - name: Upload release asset
+        uses: softprops/action-gh-release@v2
+        with:
+          files: "IridiumSkyblock-*.jar"
+
+  publish-nexus:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Downloading artifact
+        uses: actions/checkout@v2
+      - uses: thecodemonkey/action-get-gradle-version@master
+        id: version
+        with:
+          file: "build.gradle.kts"
+      - uses: actions/[email protected]
+        with:
+          name: "IridiumSkyblock"
+          path: "./"
+
+      - name: Publishing to Nexus
+        uses: sonatype-nexus-community/nexus-repo-github-action@master
+        with:
+          serverUrl: "https://nexus.iridiumdevelopment.net/"
+          username: "${{ secrets.NEXUS_USERNAME }}"
+          password: "${{ secrets.NEXUS_PASSWORD }}"
+          format: "maven2"
+          repository: "maven-releases"
+          coordinates: "groupId=com.iridium artifactId=IridiumSkyblock version=${{steps.version.outputs.version}} generate-pom=on"
+          assets: "extension=jar"
+          filename: "IridiumSkyblock-*.jar"
+
+#  publish-hangar:
+#    needs: build
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Downloading artifact
+#        uses: actions/checkout@v2
+#      - uses: thecodemonkey/action-get-gradle-version@master
+#        id: version
+#        with:
+#          file: "build.gradle.kts"
+#      - uses: actions/[email protected]
+#        with:
+#          name: "IridiumSkyblock"
+#          path: "./"
+#
+#      - if: github.event.release.prerelease == true
+#        name: Publishing to Hangar (Beta)
+#        uses: benwoo1110/[email protected]
+#        with:
+#          api-token: ${{ secrets.HANGAR_API_TOKEN }}
+#          slug: IridiumSkyblock
+#          channel: beta
+#          version: ${{steps.version.outputs.version}}
+#          files: "IridiumSkyblock-*.jar"
+#
+#      - if: github.event.release.prerelease == false
+#        name: Publishing to Hangar (Release)
+#        uses: benwoo1110/[email protected]
+#        with:
+#          api-token: ${{ secrets.HANGAR_API_TOKEN }}
+#          slug: IridiumSkyblock
+#          channel: release
+#          version: ${{steps.version.outputs.version}}
+#          files: "IridiumSkyblock-*.jar"
+
+  publish-modrinth:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Downloading artifact
+        uses: actions/checkout@v2
+      - uses: thecodemonkey/action-get-gradle-version@master
+        id: version
+        with:
+          file: "build.gradle.kts"
+      - uses: actions/[email protected]
+        with:
+          name: "IridiumSkyblock"
+          path: "./"
+
+      - if: github.event.release.prerelease == true
+        name: Publish to Modrinth (Beta)
+        uses: Kir-Antipov/[email protected]
+        with:
+          files: "IridiumSkyblock-*.jar"
+          version: ${{steps.version.outputs.version}}
+          version-type: beta
+          modrinth-id: uVMG0MzO
+          modrinth-featured: false
+          modrinth-unfeature-mode: any
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: |
+            paper
+            spigot
+          game-versions: |
+            >=1.13 <=1.20.4
+
+      - if: github.event.release.prerelease == false
+        name: Publish to Modrinth (Release)
+        uses: Kir-Antipov/[email protected]
+        with:
+          files: "IridiumSkyblock-*.jar"
+          version: ${{steps.version.outputs.version}}
+          version-type: release
+          modrinth-id: uVMG0MzO
+          modrinth-featured: true
+          modrinth-unfeature-mode: any
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: |
+            paper
+            spigot
+          game-versions: |
+            >=1.13 <=1.20.4

README.md

@@ -17,7 +17,7 @@ Every aspect of the plugin has been carefully crafted to suit the server's needs
 
 ## Getting Started
 
-Download the plugin from [Spigot](https://www.spigotmc.org/resources/iridium-skyblock-1-13-1-19.62480/), download builds from our [Github](https://github.com/Iridium-Development/IridiumSkyblock/releases), or compile it yourself.
+Download the plugin from [Spigot](https://www.spigotmc.org/resources/iridium-skyblock-1-13-1-19.62480/), [Modrinth](https://modrinth.com/plugin/iridiumskyblock), [Hangar](https://hangar.papermc.io/IridiumDevelopment/IridiumSkyblock), [Github Releases](https://github.com/Iridium-Development/IridiumSkyblock/releases), or compile it yourself.
 
 Once you have a copy of the plugin (it should be a ``.jar`` file), simply place it in the ``server/plugins`` folder.