From e67782035b71ae68f191e62aad79b054eeda68f7 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Fri, 24 Jan 2025 18:10:08 +0300
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@7399988c Fix hover in /plugins
PurpurMC/Purpur@5e5857dc [ci/skip] modify ci skip references in paper upstream commits
---
 .../0013-Implement-Linear-region-format.patch         | 11 ++++++++++-
 gradle.properties                                     |  2 +-
 scripts/upstreamCommit.sh                             |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/divinemc-server/minecraft-patches/features/0013-Implement-Linear-region-format.patch b/divinemc-server/minecraft-patches/features/0013-Implement-Linear-region-format.patch
index b9cba6c..6863ab1 100644
--- a/divinemc-server/minecraft-patches/features/0013-Implement-Linear-region-format.patch
+++ b/divinemc-server/minecraft-patches/features/0013-Implement-Linear-region-format.patch
@@ -23,9 +23,18 @@ index a814512fcfb85312474ae2c2c21443843bf57831..c2bc8464cf3f1722394d55d91f638f57
      public MoonriseRegionFileIO.RegionDataController.WriteData moonrise$startWrite(
              final int chunkX, final int chunkZ, final CompoundTag compound
 diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
-index 98fbc5c8044bd945d64569f13412a6e7e49a4e7f..f03ec474969457d90b4d22dfb0acd393146039b0 100644
+index 98fbc5c8044bd945d64569f13412a6e7e49a4e7f..25e205654ef0450f61c57e16c52d7aa559d83ec3 100644
 --- a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
 +++ b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
+@@ -1260,7 +1260,7 @@ public final class MoonriseRegionFileIO {
+                 this.regionDataController.finishWrite(this.chunkX, this.chunkZ, writeData);
+                 // Paper start - flush regionfiles on save
+                 if (this.world.paperConfig().chunks.flushRegionsOnSave) {
+-                    final RegionFile regionFile = this.regionDataController.getCache().moonrise$getRegionFileIfLoaded(this.chunkX, this.chunkZ);
++                    final space.bxteam.divinemc.region.AbstractRegionFile regionFile = this.regionDataController.getCache().moonrise$getRegionFileIfLoaded(this.chunkX, this.chunkZ); // DivineMC - linear region format
+                     if (regionFile != null) {
+                         regionFile.flush();
+                     } // else: evicted from cache, which should have called flush
 @@ -1470,7 +1470,7 @@ public final class MoonriseRegionFileIO {
  
          public static interface IORunnable {
diff --git a/gradle.properties b/gradle.properties
index 6c98092..c43d031 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
 
 mcVersion=1.21.4
 version=1.21.4-R0.1-SNAPSHOT
-purpurRef=4a0a86b918c59800df9063194a789d04530f940e
+purpurRef=5e5857dc91b7015ac72df1f40bd715c84ef61231
 experimental=false
 
 org.gradle.configuration-cache=true
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh
index 7a1eca8..cbc058b 100755
--- a/scripts/upstreamCommit.sh
+++ b/scripts/upstreamCommit.sh
@@ -5,7 +5,7 @@
 # upstreamCommit <old hash>
 
 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])"')"
+    curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"$1"/compare/"$2"...HEAD | jq -r '.commits[] | "'"$1"'@\(.sha[:8]) \(.commit.message | split("\r\n")[0] | split("\n")[0])" | sub("\\[ci( |-)skip]"; "[ci/skip]")'
 }
 
 (
@@ -23,4 +23,4 @@ log="Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
 
 echo -e "$log" | git commit -F -
 
-) || exit 1
\ No newline at end of file
+) || exit 1