From 85680d067f1712ed176b515d834a2c7d30a23a36 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 17 Jul 2025 23:00:27 +0800 Subject: [PATCH] Update Leaf 1.21.8 Co-Authored-By: Pascalpex <68245106+Pascalpex@users.noreply.github.com> --- .../{build-1217.yml => build-1218.yml} | 26 +++++++++---------- .github/workflows/build-pr.yml | 8 +++--- .github/workflows/publish-api.yml | 2 +- README.md | 6 ++--- build.gradle.kts | 10 +++---- gradle.properties | 6 ++--- ...0004-Vectorized-map-color-conversion.patch | 4 +-- leaf-server/build.gradle.kts.patch | 2 +- public/readme/README_CN.md | 6 ++--- scripts/prepareRelease.sh | 6 ++--- scripts/upstreamCommit.sh | 2 +- 11 files changed, 39 insertions(+), 39 deletions(-) rename .github/workflows/{build-1217.yml => build-1218.yml} (90%) diff --git a/.github/workflows/build-1217.yml b/.github/workflows/build-1218.yml similarity index 90% rename from .github/workflows/build-1217.yml rename to .github/workflows/build-1218.yml index 8ddcc0b1..5cf8b7cb 100644 --- a/.github/workflows/build-1217.yml +++ b/.github/workflows/build-1218.yml @@ -1,8 +1,8 @@ -name: Build Leaf 1.21.7 +name: Build Leaf 1.21.8 on: push: - branches: [ "ver/1.21.7" ] + branches: [ "ver/1.21.8" ] workflow_dispatch: jobs: @@ -93,15 +93,15 @@ jobs: - name: Upload Leaf uses: actions/upload-artifact@v4 with: - name: Leaf 1.21.7 - path: ./leaf-1.21.7-${{ env.BUILD_NUMBER }}.jar + name: Leaf 1.21.8 + path: ./leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar - name: Release Leaf uses: softprops/action-gh-release@v2 with: - name: "Leaf 1.21.7" - tag_name: "ver-1.21.7" - files: "./leaf-1.21.7-${{ env.BUILD_NUMBER }}.jar" + name: "Leaf 1.21.8" + tag_name: "ver-1.21.8" + files: "./leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar" body_path: "./release_notes.md" token: "${{ secrets.GITHUB_TOKEN }}" target_commitish: "${{ github.sha }}" @@ -111,7 +111,7 @@ jobs: - name: Calculate SHA-256 id: hash run: | - FILE_NAME="leaf-1.21.7-${{ env.BUILD_NUMBER }}.jar" + FILE_NAME="leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar" HASH=$(sha256sum "$FILE_NAME" | awk '{ print $1 }') echo "sha256=$HASH" >> $GITHUB_OUTPUT @@ -121,7 +121,7 @@ jobs: host: ${{ secrets.API_HOST }} username: ${{ secrets.API_USER }} password: ${{ secrets.API_PASS }} - source: "./leaf-1.21.7-${{ env.BUILD_NUMBER }}.jar" + source: "./leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar" target: "~/api/uploads/" - name: Insert build to download API @@ -141,11 +141,11 @@ jobs: node insertBuild.js \ --projectName leaf \ --projectFriendlyName "Leaf" \ - --version 1.21.7 \ - --versionGroupName 1.21.7 \ - --versionName 1.21.7 \ + --version 1.21.8 \ + --versionGroupName 1.21.8 \ + --versionName 1.21.8 \ --build-number ${{ env.BUILD_NUMBER }} \ --repositoryPath "$REPO_DIR" \ --storagePath /root/api/storage \ - --download "primary:/root/api/uploads/leaf-1.21.7-${{ env.BUILD_NUMBER }}.jar:${{ steps.hash.outputs.sha256 }}" \ + --download "primary:/root/api/uploads/leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar:${{ steps.hash.outputs.sha256 }}" \ --buildChannel default diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index aacd9364..2f314927 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -2,7 +2,7 @@ name: Build Pull Request on: pull_request: - branches: [ "ver/1.21.7" ] + branches: [ "ver/1.21.8" ] jobs: build: @@ -34,9 +34,9 @@ jobs: - name: Rename Paperclip JARs run: | - mv leaf-server/build/libs/leaf-paperclip-1.21.7-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21.7.jar + mv leaf-server/build/libs/leaf-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21.8.jar - name: Upload Leaf as build artifact uses: actions/upload-artifact@v4 with: - name: Leaf 1.21.7 - path: ./leaf-1.21.7.jar + name: Leaf 1.21.8 + path: ./leaf-1.21.8.jar diff --git a/.github/workflows/publish-api.yml b/.github/workflows/publish-api.yml index 07d6cd88..bfb70c7f 100644 --- a/.github/workflows/publish-api.yml +++ b/.github/workflows/publish-api.yml @@ -2,7 +2,7 @@ name: Publish API on: push: - branches: [ "ver/1.21.7" ] + branches: [ "ver/1.21.8" ] jobs: build: diff --git a/README.md b/README.md index a2a9ba37..860aa4a3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@
[![Download](https://img.shields.io/badge/releases-blue?label=download&style=for-the-badge&colorA=19201a&colorB=298046)](https://www.leafmc.one/download)⠀ -[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1217.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀ +[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1218.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀ [![Discord](https://img.shields.io/discord/1145991395388162119?label=discord&style=for-the-badge&colorA=19201a&colorB=298046)](https://discord.gg/gfgAwdSEuM) [![Docs](https://img.shields.io/badge/leafmc.one/docs/-blue?label=docs&style=for-the-badge&colorA=19201a&colorB=298046)](https://www.leafmc.one/docs) @@ -65,7 +65,7 @@ Building a Paperclip JAR for distribution: cn.dreeam.leaf leaf-api - 1.21.7-R0.1-SNAPSHOT + 1.21.8-R0.1-SNAPSHOT provided ``` @@ -78,7 +78,7 @@ repositories { } dependencies { - compileOnly("cn.dreeam.leaf:leaf-api:1.21.7-R0.1-SNAPSHOT") + compileOnly("cn.dreeam.leaf:leaf-api:1.21.8-R0.1-SNAPSHOT") } java { diff --git a/build.gradle.kts b/build.gradle.kts index e42c50b0..3bd0d5e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { `maven-publish` - id("io.papermc.paperweight.patcher") version "2.0.0-beta.17" + id("io.papermc.paperweight.patcher") version "2.0.0-beta.18" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" @@ -30,19 +30,19 @@ subprojects { isPreserveFileTimestamps = false isReproducibleFileOrder = true } - tasks.withType { + tasks.withType().configureEach { options.encoding = Charsets.UTF_8.name() options.release = 21 options.isFork = true options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal")) } - tasks.withType { + tasks.withType().configureEach { options.encoding = Charsets.UTF_8.name() } - tasks.withType { + tasks.withType().configureEach { filteringCharset = Charsets.UTF_8.name() } - tasks.withType { + tasks.withType().configureEach { testLogging { showStackTraces = true exceptionFormat = TestExceptionFormat.FULL diff --git a/gradle.properties b/gradle.properties index 26e5501a..0b34f30c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=cn.dreeam.leaf -mcVersion=1.21.7 -version=1.21.7-R0.1-SNAPSHOT +mcVersion=1.21.8 +version=1.21.8-R0.1-SNAPSHOT -paperCommit=e792779dd8d8ba06d6448ca34bdd98da1daed481 +paperCommit=d8cb3f5852ef58d4a53ea82f98805dafdfa3bf4e org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/leaf-api/paper-patches/features/0004-Vectorized-map-color-conversion.patch b/leaf-api/paper-patches/features/0004-Vectorized-map-color-conversion.patch index 95fdc34c..4d36afc7 100644 --- a/leaf-api/paper-patches/features/0004-Vectorized-map-color-conversion.patch +++ b/leaf-api/paper-patches/features/0004-Vectorized-map-color-conversion.patch @@ -110,7 +110,7 @@ index 0000000000000000000000000000000000000000..00b16e4aacba50996b81fac81c3f78b6 + +} diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java -index 2b9e4aa8cf35e7106e510e547954ee7e1bcf3d81..794ae24eee9a20c6db4690b527f5e005d5ca3f00 100644 +index 204860b32b4958a2804b2e5bc82f5be099e461f3..df3753e7593aedb1ed6731be86a6e90ff8449f3e 100644 --- a/src/main/java/org/bukkit/map/MapPalette.java +++ b/src/main/java/org/bukkit/map/MapPalette.java @@ -35,7 +35,7 @@ public final class MapPalette { @@ -120,7 +120,7 @@ index 2b9e4aa8cf35e7106e510e547954ee7e1bcf3d81..794ae24eee9a20c6db4690b527f5e005 - static final Color[] colors = { + public static final Color[] colors = { // Gale - Pufferfish - vectorized map color conversion - package -> public // Start generate - MapPalette#colors - // @GeneratedFrom 1.21.7 + // @GeneratedFrom 1.21.8 new Color(0x00000000, true), @@ -395,9 +395,15 @@ public final class MapPalette { temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth()); diff --git a/leaf-server/build.gradle.kts.patch b/leaf-server/build.gradle.kts.patch index 70384a77..1ce25f14 100644 --- a/leaf-server/build.gradle.kts.patch +++ b/leaf-server/build.gradle.kts.patch @@ -7,7 +7,7 @@ +val leafMavenPublicUrl = "https://maven.nostal.ink/repository/maven-snapshots/" // Leaf - project setup - Add publish repo dependencies { - mache("io.papermc:mache:1.21.7+build.2") + mache("io.papermc:mache:1.21.8+build.1") - paperclip("io.papermc:paperclip:3.0.3") + paperclip("cn.dreeam:quantumleaper:1.0.0-SNAPSHOT") // Leaf - project setup - Use own paperclip fork testRuntimeOnly("org.junit.platform:junit-platform-launcher") diff --git a/public/readme/README_CN.md b/public/readme/README_CN.md index f7ea6159..ba520ab4 100644 --- a/public/readme/README_CN.md +++ b/public/readme/README_CN.md @@ -2,7 +2,7 @@
[![下载](https://img.shields.io/badge/releases-blue?label=%e4%b8%8b%e8%bd%bd&style=for-the-badge&colorA=19201a&colorB=298046)](https://www.leafmc.one/zh/download)⠀ -[![Github Actions 构建](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1217.yml?label=%e6%9e%84%e5%bb%ba&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀ +[![Github Actions 构建](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1218.yml?label=%e6%9e%84%e5%bb%ba&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀ ![QQ](https://img.shields.io/badge/619278377-blue?label=QQ%e7%be%a4&style=for-the-badge&colorA=19201a&colorB=298046) [![文档](https://img.shields.io/badge/leafmc.one/zh/docs-blue?label=%e6%96%87%e6%a1%a3&style=for-the-badge&colorA=19201a&colorB=298046)](https://www.leafmc.one/zh/docs) @@ -65,7 +65,7 @@ cn.dreeam.leaf leaf-api - 1.21.7-R0.1-SNAPSHOT + 1.21.8-R0.1-SNAPSHOT provided ``` @@ -78,7 +78,7 @@ repositories { } dependencies { - compileOnly("cn.dreeam.leaf:leaf-api:1.21.7-R0.1-SNAPSHOT") + compileOnly("cn.dreeam.leaf:leaf-api:1.21.8-R0.1-SNAPSHOT") } java { diff --git a/scripts/prepareRelease.sh b/scripts/prepareRelease.sh index f9c8a3af..c342e7f7 100755 --- a/scripts/prepareRelease.sh +++ b/scripts/prepareRelease.sh @@ -5,12 +5,12 @@ IS_EOL=false IS_UNSUPPORTED=false IS_DEV=false -JAR_NAME="leaf-1.21.7" -CURRENT_TAG="ver-1.21.7" +JAR_NAME="leaf-1.21.8" +CURRENT_TAG="ver-1.21.8" RELEASE_NOTES="release_notes.md" # Rename Leaf jar -mv ./leaf-server/build/libs/leaf-paperclip-1.21.7-R0.1-SNAPSHOT-mojmap.jar ./$JAR_NAME-${BUILD_NUMBER}.jar +mv ./leaf-server/build/libs/leaf-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar ./$JAR_NAME-${BUILD_NUMBER}.jar # Branch name CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index 01720684..f7596e6e 100755 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -64,7 +64,7 @@ fi # Purpur updates if [ -n "$purpurHash" ]; then - purpur=$(getCommits "PurpurMC/Purpur" "$purpurHash" "ver/1.21.7") # Update this on every version update + purpur=$(getCommits "PurpurMC/Purpur" "$purpurHash" "ver/1.21.8") # Update this on every version update # Updates found if [ -n "$purpur" ]; then