mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-19 14:59:30 +00:00
70571388cf
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f9edc4b Update paperweight to 1.5.11 PaperMC/Paper@2f92d4e Updated Upstream (Bukkit/CraftBukkit) PaperMC/Paper@8d8eb3b optimise explosion damage further PaperMC/Paper@7606e6d fixup tests and add missing API detected by those tests PaperMC/Paper@f17622c more cleanup and resource pack api fixes PaperMC/Paper@9051fc3 remove redundant patch PaperMC/Paper@abfb6b2 more work on adventure codecs PaperMC/Paper@b42a1da Use uuid param in setResourcePack PaperMC/Paper@bcbe5dc Fix `PlayerInteractEvent#getClickedBlock()` returning wrong block in adventure mode (#10019)
28 lines
791 B
Bash
Executable File
28 lines
791 B
Bash
Executable File
exit_on_error() {
|
|
echo "$1"
|
|
exit 1
|
|
}
|
|
|
|
git reset HEAD --hard
|
|
|
|
oldHash=$(grep "paperRef=" gradle.properties | cut -d "=" -f2)
|
|
newHash=$(curl -s https://api.github.com/repos/PaperMC/paper/commits/master | jq -r .sha)
|
|
|
|
if [ "$oldHash" = "$newHash" ]; then
|
|
echo "Upstream has not updated!"
|
|
exit 0
|
|
fi
|
|
|
|
echo "Updating paper: $oldHash -> $newHash"
|
|
|
|
sed -i "s/$oldHash/$newHash/g" gradle.properties
|
|
git add gradle.properties
|
|
|
|
./gradlew applyPatches || exit_on_error "An error occurred when merging patches!"
|
|
./gradlew rebuildPatches || exit_on_error "An error occurred when rebuilding patches!"
|
|
./gradlew createReobfPaperclipJar || exit_on_error "An error occurred when building!"
|
|
|
|
scripts/upstreamCommit.sh $oldHash $newHash
|
|
|
|
echo "Created new commit, please review before pushing."
|