From 24cf7beab02718e5fa0c1a61668208a8cb7c4fc1 Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Sun, 11 Feb 2024 22:49:33 -0500 Subject: [PATCH] chore: use blob build --- .github/ISSUE_TEMPLATE/bug-report.yml | 14 +++------- .github/workflows/blob-build.yml | 26 +++++++++++++++++++ .github/workflows/maven.yml | 18 ++++++------- README.md | 7 +---- pom.xml | 4 +-- .../mobcapturer/MobCapturer.java | 6 ++--- 6 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/blob-build.yml diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index ce1fa4a..96bf3a2 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -18,7 +18,7 @@ body: label: Checklist description: Please go through this checklist before you create the issue. options: - - label: You are using official version downloaded from Builds (https://thebusybiscuit.github.io/builds/) + - label: You are using official version downloaded from Blob Builds (https://blob.build) required: true - label: You did not modify the jar file required: true @@ -96,18 +96,12 @@ body: validations: required: true - - type: dropdown + - type: input id: minecraft-version attributes: label: Minecraft Version - description: Please select your Minecraft Version - options: - - 1.20.x - - 1.19.x - - 1.18.x - - 1.17.x - - 1.16.x - - Older versions are not supported + description: Please type your Minecraft Version + placeholder: 1.16.5 validations: required: true diff --git a/.github/workflows/blob-build.yml b/.github/workflows/blob-build.yml new file mode 100644 index 0000000..8c21d0b --- /dev/null +++ b/.github/workflows/blob-build.yml @@ -0,0 +1,26 @@ +name: Blob Build + +on: + push: + branches: + - master + +jobs: + build: + if: startsWith(github.event.head_commit.message, '[CI skip]') == false + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + - name: Build with Maven + run: mvn package --file pom.xml + - name: Upload to Blob Builds + uses: WalshyDev/blob-builds/gh-action@main + with: + project: MobCapturer + apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }} + releaseNotes: ${{ github.event.head_commit.message }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0b5cd2d..daf83bb 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -3,23 +3,21 @@ name: Java CI on: push: branches: - - master + - master pull_request: branches: - - master + - master jobs: build: - + if: startsWith(github.event.head_commit.message, '[CI skip]') == false runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.0.2 - - name: Set up JDK 16 - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: 16 - cache: 'maven' + java-version: 17 + distribution: temurin - name: Build with Maven run: mvn package --file pom.xml diff --git a/README.md b/README.md index 6757144..5f4b323 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,8 @@ But the mobs that do work work extremely well!
The captured mobs will retain attributes, potion effects, fire ticks, custom names, their health and even entity-specific traits like wool colors and much more. ## :floppy_disk: Download MobCapturer -You can download MobCapturer right here: [Development Builds](https://thebusybiscuit.github.io/builds/TheBusyBiscuit/MobCapturer/master/) +You can download MobCapturer right here: [Dev Builds](https://blob.build/project/MobCapturer) -

- - Build Server - -

## :gear: config You can change the following settings in `config.yml`: diff --git a/pom.xml b/pom.xml index b931307..396a9e2 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ com.github.Slimefun Slimefun4 - RC-35 + RC-36 provided @@ -118,7 +118,7 @@ org.bstats bstats-bukkit - 3.0.0 + 3.0.2 compile diff --git a/src/main/java/io/github/thebusybiscuit/mobcapturer/MobCapturer.java b/src/main/java/io/github/thebusybiscuit/mobcapturer/MobCapturer.java index c05a25a..d80a43c 100644 --- a/src/main/java/io/github/thebusybiscuit/mobcapturer/MobCapturer.java +++ b/src/main/java/io/github/thebusybiscuit/mobcapturer/MobCapturer.java @@ -11,7 +11,7 @@ import io.github.thebusybiscuit.mobcapturer.setup.Setup; import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon; import io.github.thebusybiscuit.slimefun4.libraries.dough.config.Config; -import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.GitHubBuildsUpdater; +import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.BlobBuildUpdater; /** * MobCapturer Slimefun addon @@ -46,8 +46,8 @@ public void onEnable() { Config cfg = new Config(this); new Metrics(this, 6672); - if (cfg.getBoolean("options.auto-update") && getDescription().getVersion().startsWith("DEV - ")) { - new GitHubBuildsUpdater(this, getFile(), "TheBusyBiscuit/MobCapturer/master").start(); + if (cfg.getBoolean("options.auto-update") && getDescription().getVersion().startsWith("Dev - ")) { + new BlobBuildUpdater(this, getFile(), "MobCapturer").start(); } registry = new Registry(cfg);