From 584a970b10ac911c32a890a5acd2e521cd1a12bd Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 16 Nov 2025 09:10:54 +0300
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@5a87356f Updated Upstream (Paper)
PurpurMC/Purpur@2adf3f87 previous commit won't build without this
PurpurMC/Purpur@c4bf3181 deprecate block highlight api until further notice
PurpurMC/Purpur@75b794ad deprecate EntityTeleportHinderedEvent
---
 .../0010-SparklyPaper-Parallel-world-ticking.patch     | 10 +++++-----
 divinemc-server/build.gradle.kts.patch                 |  7 +++----
 gradle.properties                                      |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/divinemc-api/paper-patches/features/0010-SparklyPaper-Parallel-world-ticking.patch b/divinemc-api/paper-patches/features/0010-SparklyPaper-Parallel-world-ticking.patch
index 2f05303..9a34940 100644
--- a/divinemc-api/paper-patches/features/0010-SparklyPaper-Parallel-world-ticking.patch
+++ b/divinemc-api/paper-patches/features/0010-SparklyPaper-Parallel-world-ticking.patch
@@ -10,11 +10,11 @@ Original project: https://github.com/SparklyPower/SparklyPaper
 This patch provides an API for performance monitoring plugins.
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bf664ec7a3974abdb7fd3266b08803a02cb05929..d21f2c33480177f4892c906b80ffe89686ac663a 100644
+index 78e624c309bfa47ac35f1b947d42391f3206d8fc..60f54674575fd015810f4ea88af442c84a43d2a7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2879,4 +2879,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-      */
+@@ -2893,4 +2893,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     @Deprecated
      void clearBlockHighlights();
      // Purpur end - Debug Marker API
 +
@@ -30,10 +30,10 @@ index bf664ec7a3974abdb7fd3266b08803a02cb05929..d21f2c33480177f4892c906b80ffe896
 +    // DivineMC end - Parallel world ticking
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7f55f19173c369c73b81a5784c6bedd648527d6b..be3035da71001fba183fe0bc79fce36a817befd2 100644
+index 07390a45222a593768d1338b4739131e915869a5..84afc14168351cf8f5c9ca3b32f7885b3c2a2522 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4725,4 +4725,23 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4739,4 +4739,23 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
              }
          }
      }
diff --git a/divinemc-server/build.gradle.kts.patch b/divinemc-server/build.gradle.kts.patch
index e9858e8..982da3b 100644
--- a/divinemc-server/build.gradle.kts.patch
+++ b/divinemc-server/build.gradle.kts.patch
@@ -77,9 +77,6 @@
  
  dependencies {
 -    implementation(project(":purpur-api")) // Purpur
--    implementation("ca.spottedleaf:concurrentutil:0.0.5")
--    implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
--    implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
 +    implementation(project(":divinemc-api")) // DivineMC - Rebrand
 +
 +    // DivineMC start - Dependencies
@@ -94,7 +91,9 @@
 +    implementation("net.objecthunter:exp4j:0.4.8")
 +    // DivineMC end - Dependencies
 +
-+    implementation("ca.spottedleaf:concurrentutil:0.0.7") // DivineMC - Bump dependencies - temporary
+     implementation("ca.spottedleaf:concurrentutil:0.0.7")
+-    implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
+-    implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
 +    implementation("org.jline:jline-terminal-ffm:3.29.0") // use ffm on java 22+ // DivineMC - Bump dependencies
 +    implementation("org.jline:jline-terminal-jni:3.29.0") // fall back to jni on java 21 // DivineMC - Bump dependencies
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
diff --git a/gradle.properties b/gradle.properties
index e8a9103..53e2efa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
 version=1.21.10-R0.1-SNAPSHOT
 
 mcVersion=1.21.10
-purpurRef=d22f66f2ad204f7bd5ef007adace7a5381aa5dd3
+purpurRef=75b794ad47478657f0472819a5e94d08eeda8546
 experimental=false
 
 org.gradle.configuration-cache=true