From c06476b65acfbc140b302c1337c669cc2e441bb4 Mon Sep 17 00:00:00 2001 From: mc_Edwin <99588600+EdwinYoungSteve@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:45:11 +0800 Subject: [PATCH 1/6] Update Aspect.java --- .../groovyscript/compat/mods/thaumcraft/aspect/Aspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/thaumcraft/aspect/Aspect.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/thaumcraft/aspect/Aspect.java index c56ed6919..d06992b04 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/thaumcraft/aspect/Aspect.java +++ b/src/main/java/com/cleanroommc/groovyscript/compat/mods/thaumcraft/aspect/Aspect.java @@ -117,7 +117,7 @@ public AspectBuilder blend(int blend) { @RecipeBuilderRegistrationMethod public thaumcraft.api.aspects.Aspect register() { try { - thaumcraft.api.aspects.Aspect aspect = new thaumcraft.api.aspects.Aspect(tag, chatColor, components.getAspects(), image, blend); + thaumcraft.api.aspects.Aspect aspect = new thaumcraft.api.aspects.Aspect(tag, chatColor, components.size() == 0 ? null : components.getAspects(), image, blend); ModSupport.THAUMCRAFT.get().aspect.add(aspect); return aspect; } catch (IllegalArgumentException e) { From 80404145eff2a9a8586d4c9a3ca2276cfbf66d69 Mon Sep 17 00:00:00 2001 From: mc_Edwin <99588600+EdwinYoungSteve@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:56:57 +0800 Subject: [PATCH 2/6] Create gradle.yml --- .github/workflows/gradle.yml | 91 ++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 000000000..085b88c2f --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,91 @@ +Skip to content +Navigation Menu +CleanroomMC +/ +GroovyScript + +Type / to search +Code +Issues +9 +Pull requests +9 +Actions +Projects +Wiki +Security +Insights +Build Test Artifact +pass event as delegate and not as parameter when event class is passe… #44 +Jobs +Run details +Workflow file for this run +.github/workflows/test_build.yaml at dfcf525 +# This workflow will build and upload test artifact +# Simple workflow with ignoring condition to prevent unneccessary build +# To download artifact check on job task + +name: Build Test Artifact + +on: + push: + branches: + - master + paths-ignore: + - '.github/**' # Release GHA file, please change this when you change the file name + - 'LICENSE' + - 'README.md' + - 'examples/**' + - 'editors/**' + - '.editorconfig' + workflow_dispatch: + +jobs: + build: + name: Build and Upload Artifact + runs-on: ubuntu-latest + + steps: + - name: Checkout branch + uses: actions/checkout@v4.1.7 + + # https://github.com/madhead/read-java-properties#error-java_home-is-set-to-an-invalid-directory + - name: Gather Gradle properties + uses: madhead/read-java-properties@latest + id: gradle_properties + with: + file: gradle.properties + all: true + + - name: Retrieve SHA short + id: vars + shell: bash + run: echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + + - name: Change mod version + run: sed -i "s/mod_version.*=.*/mod_version = ${{ steps.gradle_properties.outputs.mod_version }}-${{ steps.vars.outputs.SHA_SHORT }}/g" gradle.properties + + - name: Set up Temurin JDK 8 + uses: actions/setup-java@v4.2.1 + with: + distribution: 'temurin' + java-version: '8' + cache: gradle # Only cache stuff since test build action happen mostly + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3.4.2 + + - name: Build Project + run: ./gradlew build + + - name: Upload Build Artifacts + uses: actions/upload-artifact@v4.3.4 + with: + name: GroovyScript-${{ steps.gradle_properties.outputs.modVersion }}-${{ github.run_number }} + path: build/libs +pass event as delegate and not as parameter when event class is passed in listen method · CleanroomMC/GroovyScript@dfcf525 + + From ebb80c88a813b8dca429bc3ba19c8de2bd63ea12 Mon Sep 17 00:00:00 2001 From: mc_Edwin <99588600+EdwinYoungSteve@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:59:56 +0800 Subject: [PATCH 3/6] Create gradle2.yml --- .github/workflows/gradle2.yml | 67 +++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/gradle2.yml diff --git a/.github/workflows/gradle2.yml b/.github/workflows/gradle2.yml new file mode 100644 index 000000000..160fd606c --- /dev/null +++ b/.github/workflows/gradle2.yml @@ -0,0 +1,67 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - uses: actions/checkout@v4 + - name: Set up Temurin JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. + # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md + - name: Setup Gradle + uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + + - name: Build with Gradle Wrapper + run: ./gradlew build + + # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html). + # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version. + # + # - name: Setup Gradle + # uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + # with: + # gradle-version: '8.9' + # + # - name: Build with Gradle 8.9 + # run: gradle build + + dependency-submission: + + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - uses: actions/checkout@v4 + - name: Set up Temurin JDK 8 + uses: actions/setup-java@v4.2.1 + with: + distribution: 'temurin' + java-version: '8' + + # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies. + # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 From d552a10789da45898a175b853a8ce38cab9f4c42 Mon Sep 17 00:00:00 2001 From: mc_Edwin <99588600+EdwinYoungSteve@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:10:09 +0800 Subject: [PATCH 4/6] Create gradle3.yml --- .github/workflows/gradle3.yml | 67 +++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/gradle3.yml diff --git a/.github/workflows/gradle3.yml b/.github/workflows/gradle3.yml new file mode 100644 index 000000000..0885752ac --- /dev/null +++ b/.github/workflows/gradle3.yml @@ -0,0 +1,67 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. + # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md + - name: Setup Gradle + uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + + - name: Build with Gradle Wrapper + run: ./gradlew build + + # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html). + # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version. + # + # - name: Setup Gradle + # uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + # with: + # gradle-version: '8.9' + # + # - name: Build with Gradle 8.9 + # run: gradle build + + dependency-submission: + + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies. + # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 From 24bd17a099a959180ec01cc8e254d984bc148aef Mon Sep 17 00:00:00 2001 From: mc_Edwin <99588600+EdwinYoungSteve@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:44:51 +0800 Subject: [PATCH 5/6] Create main.yml --- .github/workflows/main.yml | 65 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..66e97eb9b --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,65 @@ +# This workflow will build and upload test artifact +# Simple workflow with ignoring condition to prevent unneccessary build +# To download artifact check on job task + +name: Build Test Artifact + +on: + push: + branches: + - master + paths-ignore: + - '.github/**' # Release GHA file, please change this when you change the file name + - 'LICENSE' + - 'README.md' + - 'examples/**' + - 'editors/**' + - '.editorconfig' + workflow_dispatch: + +jobs: + build: + name: Build and Upload Artifact + runs-on: ubuntu-latest + + steps: + - name: Checkout branch + uses: actions/checkout@v4.1.7 + + # https://github.com/madhead/read-java-properties#error-java_home-is-set-to-an-invalid-directory + - name: Gather Gradle properties + uses: madhead/read-java-properties@latest + id: gradle_properties + with: + file: gradle.properties + all: true + + - name: Retrieve SHA short + id: vars + shell: bash + run: echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + + - name: Change mod version + run: sed -i "s/mod_version.*=.*/mod_version = ${{ steps.gradle_properties.outputs.mod_version }}-${{ steps.vars.outputs.SHA_SHORT }}/g" gradle.properties + + - name: Set up Temurin JDK 8 + uses: actions/setup-java@v4.2.1 + with: + distribution: 'temurin' + java-version: '8' + cache: gradle # Only cache stuff since test build action happen mostly + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3.4.2 + + - name: Build Project + run: ./gradlew build + + - name: Upload Build Artifacts + uses: actions/upload-artifact@v4.3.4 + with: + name: GroovyScript-${{ steps.gradle_properties.outputs.modVersion }}-${{ github.run_number }} + path: build/libs From d851f6c1fbb7dc46fbc7a69203f560731c621e8e Mon Sep 17 00:00:00 2001 From: mc_Edwin <99588600+EdwinYoungSteve@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:50:15 +0800 Subject: [PATCH 6/6] Create main2.yml --- .github/workflows/main2.yml | 65 +++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/main2.yml diff --git a/.github/workflows/main2.yml b/.github/workflows/main2.yml new file mode 100644 index 000000000..66e97eb9b --- /dev/null +++ b/.github/workflows/main2.yml @@ -0,0 +1,65 @@ +# This workflow will build and upload test artifact +# Simple workflow with ignoring condition to prevent unneccessary build +# To download artifact check on job task + +name: Build Test Artifact + +on: + push: + branches: + - master + paths-ignore: + - '.github/**' # Release GHA file, please change this when you change the file name + - 'LICENSE' + - 'README.md' + - 'examples/**' + - 'editors/**' + - '.editorconfig' + workflow_dispatch: + +jobs: + build: + name: Build and Upload Artifact + runs-on: ubuntu-latest + + steps: + - name: Checkout branch + uses: actions/checkout@v4.1.7 + + # https://github.com/madhead/read-java-properties#error-java_home-is-set-to-an-invalid-directory + - name: Gather Gradle properties + uses: madhead/read-java-properties@latest + id: gradle_properties + with: + file: gradle.properties + all: true + + - name: Retrieve SHA short + id: vars + shell: bash + run: echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + + - name: Change mod version + run: sed -i "s/mod_version.*=.*/mod_version = ${{ steps.gradle_properties.outputs.mod_version }}-${{ steps.vars.outputs.SHA_SHORT }}/g" gradle.properties + + - name: Set up Temurin JDK 8 + uses: actions/setup-java@v4.2.1 + with: + distribution: 'temurin' + java-version: '8' + cache: gradle # Only cache stuff since test build action happen mostly + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3.4.2 + + - name: Build Project + run: ./gradlew build + + - name: Upload Build Artifacts + uses: actions/upload-artifact@v4.3.4 + with: + name: GroovyScript-${{ steps.gradle_properties.outputs.modVersion }}-${{ github.run_number }} + path: build/libs