From 49c5ea3d6fe21a2490432d4fca2364c2242c2d6b Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Thu, 8 Jul 2021 12:25:31 -0400 Subject: Testing formatting more than just java files --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 916c6be..216be62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: - name: Prettify the Java Code uses: lwerner-lshigh/prettier_action_java@v1.1.1 with: - prettier_options: '--no-semi --write *.java' + prettier_options: '--write .' branch: ${{ github.head_ref }} dry: ${{ github.event_name != 'push' }} env: -- cgit From 61fdf5d0834ee9d55d9a6a6b19474e1a8a687b7e Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Thu, 8 Jul 2021 12:50:00 -0400 Subject: Allow workflow to edit itself --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 216be62..7e097ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,8 @@ on: paths-ignore: - '.gitignore' workflow_dispatch: +permissions: + workflows: write jobs: build: runs-on: ubuntu-latest -- cgit From 1f01aef5c637ade69a4bd1d803847f03ffb8be31 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Thu, 8 Jul 2021 13:12:09 -0400 Subject: Why is it actions not workflows --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e097ab..c1def5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ on: - '.gitignore' workflow_dispatch: permissions: - workflows: write + actions: write jobs: build: runs-on: ubuntu-latest -- cgit From 6d07691410ddc8f6faf61a002f6cfda4b6810c29 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Thu, 8 Jul 2021 13:14:26 -0400 Subject: Wtf --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1def5a..421dc02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,7 @@ on: paths-ignore: - '.gitignore' workflow_dispatch: -permissions: - actions: write +permissions: write-all jobs: build: runs-on: ubuntu-latest -- cgit From d1b086feb5a589f526afe2016a3b726c8271af01 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Thu, 8 Jul 2021 13:22:19 -0400 Subject: Format the workflow manually because github stupid --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 421dc02..4d0c2f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,14 +3,14 @@ name: Build on: push: branches: - - '*' + - "*" paths-ignore: - - '.gitignore' + - ".gitignore" pull_request: branches: - - '*' + - "*" paths-ignore: - - '.gitignore' + - ".gitignore" workflow_dispatch: permissions: write-all jobs: @@ -40,11 +40,11 @@ jobs: path: build/libs/*.jar - name: Stop gradle daemons run: ./gradlew --stop - + Check-Formating: runs-on: ubuntu-latest name: Check Formatting - + steps: - uses: actions/checkout@v2 - name: Set up JDK 1.8 @@ -54,7 +54,7 @@ jobs: - name: Prettify the Java Code uses: lwerner-lshigh/prettier_action_java@v1.1.1 with: - prettier_options: '--write .' + prettier_options: "--write ." branch: ${{ github.head_ref }} dry: ${{ github.event_name != 'push' }} env: -- cgit From 6b94b4f0e6a20a87145ac1a544a0d19289da7e96 Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Thu, 8 Jul 2021 17:22:58 +0000 Subject: Prettified Code! --- .prettierrc.yml | 2 +- README.md | 1 + .../assets/skyblockhud/data/trackers.json | 72 +++++++++++----------- src/main/resources/mcmod.info | 28 ++++----- src/main/resources/mixins.skyblockhud.json | 2 +- src/main/resources/pack.mcmeta | 8 +-- trackers.json | 10 ++- 7 files changed, 61 insertions(+), 62 deletions(-) diff --git a/.prettierrc.yml b/.prettierrc.yml index f1cb8dc..e4672a8 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -6,4 +6,4 @@ overrides: trailingComma: none tabWidth: 4 endOfLine: lf - printWidth: 999999999 # >:c fine gravy \ No newline at end of file + printWidth: 999999999 # >:c fine gravy diff --git a/README.md b/README.md index 22cb46c..a89ee43 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![discord badge](https://img.shields.io/discord/516977525906341928?label=discord&color=9089DA&logo=discord&style=for-the-badge)](https://discord.gg/moulberry) [![made with java](https://img.shields.io/badge/Made%20With-Java-orange?style=for-the-badge&logo=java&logocolor=white)](https://www.java.com/) +