Papyrus
/
Papyrus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix backport CI: drop incompatible branding overlays and unify Gradle build. 

Older Paper versions use different ServerBuildInfoImpl and PaperVersionFetcher
signatures; keep anticheat overlays only on backports. Run applyPatches and
build in one Gradle invocation so NMS types resolve on 1.21.8/1.21.10.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Sasha Baranov 2026-06-16 15:02:23 -04:00
parent b707f7f5fd
commit f73a8f9433
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View File

@ -61,8 +61,7 @@ jobs:
run: | run: |
git config --global user.email "no-reply@github.com" git config --global user.email "no-reply@github.com"
git config --global user.name "GitHub Actions" git config --global user.name "GitHub Actions"
./gradlew applyPatches --stacktrace --no-build-cache ./gradlew applyPatches build syncPapyrusPaperclipJar --stacktrace --no-build-cache
./gradlew build syncPapyrusPaperclipJar --stacktrace --no-build-cache
- name: Upload Test Results - name: Upload Test Results
if: always() && matrix.mc == '26.1.2' if: always() && matrix.mc == '26.1.2'

8
scripts/prepare-papyrus-version.sh
View File

@ -54,16 +54,16 @@ fi
git checkout "$PAPYRUS_SOURCE_REF" -- settings.gradle.kts scripts/start.sh SUPPORTED_VERSIONS.txt .github/workflows/build.yml git checkout "$PAPYRUS_SOURCE_REF" -- settings.gradle.kts scripts/start.sh SUPPORTED_VERSIONS.txt .github/workflows/build.yml
PAPYRUS_COMMON_PATHS=( PAPYRUS_COMMON_PATHS=(
papyrus-api/src/main/java/io/papermc/paper/ServerBuildInfo.java
papyrus-api/src/main/java/io/papermc/paper/event/player/PlayerAnticheatViolationEvent.java papyrus-api/src/main/java/io/papermc/paper/event/player/PlayerAnticheatViolationEvent.java
papyrus-api/src/main/javadoc/overview.html
papyrus-server/src/main/java/io/papermc/paper/anticheat papyrus-server/src/main/java/io/papermc/paper/anticheat
papyrus-server/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
papyrus-server/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
) )
PAPYRUS_MAIN_ONLY_PATHS=( PAPYRUS_MAIN_ONLY_PATHS=(
papyrus-api/build.gradle.kts papyrus-api/build.gradle.kts
papyrus-api/src/main/java/io/papermc/paper/ServerBuildInfo.java
papyrus-api/src/main/javadoc/overview.html
papyrus-server/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
papyrus-server/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
test-plugin/build.gradle.kts test-plugin/build.gradle.kts
test-plugin/src/main/resources/paper-plugin.yml test-plugin/src/main/resources/paper-plugin.yml
papyrus-server/src/main/java/io/papermc/paper/util/EntityRandomSources.java papyrus-server/src/main/java/io/papermc/paper/util/EntityRandomSources.java