diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 870c216..070aa9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,10 @@ on: description: "Push to repo if you enter 1, default push if not released else skip push repo" required: false default: "0" + comments: + description: "Add comments to release" + required: false + default: "" permissions: write-all @@ -28,7 +32,7 @@ jobs: - name: Checkout Git Repository uses: actions/checkout@v5 - - name: Set up JDK + - name: Set Up JDK uses: actions/setup-java@v5 with: distribution: zulu @@ -59,7 +63,7 @@ jobs: if: github.event_name != 'pull_request' run: sh scripts/SetENV.sh - - name: Check if release exists + - name: Check If Release Exists if: github.event_name != 'pull_request' && env.flag_release == 'true' run: | git fetch --tags @@ -76,23 +80,34 @@ jobs: counter=$((counter + 1)) done echo "tag=${{ env.tag }}-${counter}" >> $GITHUB_ENV + echo "release_count= - ${counter}" >> $GITHUB_ENV fi echo "release_exists=${release_exists}" >> $GITHUB_ENV - name: Publish to repo - if: ( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' ) || ( env.release_exists == 'true' && inputs.force-push == '1' ) && false # do not push to any repo + if: (( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' ) || ( env.release_exists == 'true' && inputs.force-push == '1' )) && false # do not push to any repo continue-on-error: true run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true env: PRIVATE_MAVEN_REPO_PASSWORD: ${{ secrets.PRIVATE_MAVEN_REPO_PASSWORD }} PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }} - - name: Create Release + - name: Create Release - Pre Process if: ( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' ) || ( env.release_exists == 'true' && inputs.force-release == '1' ) + run: | + if [ ${{ inputs.comments }} == "" ]; then + echo "No comments provided" + echo "flag_comment=true" >> $GITHUB_ENV + else + echo "flag_comment=false" >> $GITHUB_ENV + fi + + - name: Create Release - No Comment + if: env.flag_comment == 'false' uses: ncipollo/release-action@v1 with: tag: ${{ env.tag }} - name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }} - ${{ env.release_count }} + name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}${{ env.release_count }} body: | 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }}) This release is automatically compiled by GitHub Actions @@ -105,3 +120,24 @@ jobs: prerelease: ${{ env.pre }} makeLatest: ${{ env.make_latest }} token: ${{ secrets.GITHUB_TOKEN }} + + - name: Create Release - With Comment + if: env.flag_comment == 'true' + uses: ncipollo/release-action@v1 + with: + tag: ${{ env.tag }} + name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}${{ env.release_count }} + body: | + 📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }}) + This release is automatically compiled by GitHub Actions + ### Comments + > ${{ inputs.comments }} + ### Branch Info + > ${{ github.ref_name }} + ### Commit Message + ${{ env.commit_msg }} + artifacts: ${{ env.jar_dir }} + generateReleaseNotes: true + prerelease: ${{ env.pre }} + makeLatest: ${{ env.make_latest }} + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/gradle.properties b/gradle.properties index d59e034..76fc847 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ mcVersion=1.21.8 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=50060d6dea915f328d6dcfc21f0bfd6bc4e5a1d3 +luminolRef=3abd05f4f668c87eddc44d719561c5ee6f88373e org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch index 6582e5d..69ecb5f 100644 --- a/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch +++ b/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch @@ -446,10 +446,10 @@ index 10b2cc20bbf3b70e4e09dbbe14b90506e6366158..1535bb8cec8692e8d26eaff090288f1b } diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 4b634dbb45dfb0823e7b21cf2354f89e5a6331e9..ef32bf1351aa28953bfc625d7a7d5175181a7acc 100644 +index d353b15401e629c5f367786111d5227236968d4a..e660eef2508023eef87eb6cb8f2ef0d0110f5449 100644 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java -@@ -145,7 +145,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -163,7 +163,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen public void setItem(int index, ItemStack stack) { this.unpackLootTable(null); this.getItems().set(index, stack); @@ -458,7 +458,7 @@ index 4b634dbb45dfb0823e7b21cf2354f89e5a6331e9..ef32bf1351aa28953bfc625d7a7d5175 } @Override -@@ -770,9 +770,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -788,9 +788,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen if (item.isEmpty()) { // Spigot start - SPIGOT-6693, SimpleContainer#setItem ItemStack leftover = ItemStack.EMPTY; // Paper - Make hoppers respect inventory max stack size