diff --git a/patches/todo/server/0030-lithium-ai.raid.patch b/patches/server/0020-lithium-ai.raid.patch similarity index 95% rename from patches/todo/server/0030-lithium-ai.raid.patch rename to patches/server/0020-lithium-ai.raid.patch index eba3f01..d7a49f6 100644 --- a/patches/todo/server/0030-lithium-ai.raid.patch +++ b/patches/server/0020-lithium-ai.raid.patch @@ -10,7 +10,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java -index 879c3bb661e24b9682b654def57c2800f4f8ca92..99f0b75ac2b1a8ac5fe8c525c72235847e6aa27f 100644 +index f7399737548483905f3b5c08a03876b0da54b714..008d1f12cf05c31f45f7c17970fc5bfb80369e26 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java @@ -107,6 +107,7 @@ public class Raid { diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh new file mode 100644 index 0000000..7a1eca8 --- /dev/null +++ b/scripts/upstreamCommit.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +# requires curl & jq + +# upstreamCommit + +function getCommits() { + echo "$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"$1"/compare/"$2"...HEAD | jq -r '.commits[] | "'"$1"'@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"')" +} + +( +set -e +PS1="$" + +# Purpur updates +purpurHash="$1" +purpur=$(getCommits "PurpurMC/Purpur" "$purpurHash") +updated="Purpur" +logsuffix="\n\nPurpur Changes:\n$purpur" + +disclaimer="Upstream has released updates that appear to apply and compile correctly" +log="Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}" + +echo -e "$log" | git commit -F - + +) || exit 1 \ No newline at end of file