Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@d41aaca1 Updated Upstream (Paper)

divinemc-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2346,6 +_,13 @@
+@@ -2374,6 +_,13 @@
          }
          // Purpur end
  

divinemc-server/build.gradle.kts.patch

@@ -57,7 +57,7 @@
      implementation("ca.spottedleaf:concurrentutil:0.0.3")
      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
-@@ -176,6 +_,9 @@
+@@ -177,6 +_,9 @@
      implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
      implementation("dev.omega24:upnp4j:1.0") // Purpur
  
@@ -67,8 +67,8 @@
      runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
-@@ -203,26 +_,35 @@
-     implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
+@@ -204,26 +_,35 @@
+     implementation("me.lucko:spark-paper:1.10.119-20241121.092015-1")
  }
  
 +// DivineMC start - hide irrelevant compilation warnings
@@ -86,7 +86,7 @@
          val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
          val build = System.getenv("BUILD_NUMBER") ?: null
 -        val buildTime = if (build != null) Instant.now() else Instant.EPOCH
-+        val buildTime = Instant.now() // DivineMC - Build time to current, we dont have a build server rn
++        val buildTime = Instant.now() // DivineMC - Build time to current, we dont have own CI
          val gitHash = git.exec(providers, "rev-parse", "--short=7", "HEAD").get().trim()
          val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash"
          val date = git.exec(providers, "show", "-s", "--format=%ci", gitHash).get().trim()

divinemc-server/minecraft-patches/features/0009-No-chat-sign.patch

@@ -27,10 +27,10 @@ index 47cb25aa9c37bd84d156288c397321009f1d9ae2..7837b1cc37f70949dd0931fb93d23997
          buffer.writeCollection(this.entries, (buffer1, entry) -> entry.write(buffer1));
      }
 diff --git a/net/minecraft/network/FriendlyByteBuf.java b/net/minecraft/network/FriendlyByteBuf.java
-index e5e5d9bc095ccd9fbf1c8aaa09e5c4ebb1d1c920..d1676b16db0b0d1b0a92e0279da54ae199c63324 100644
+index d1daa3443446f47e2215f0c7c5823da58e053bab..04ac5c14b511762e46983843f8142e478c764198 100644
 --- a/net/minecraft/network/FriendlyByteBuf.java
 +++ b/net/minecraft/network/FriendlyByteBuf.java
-@@ -114,6 +114,17 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -118,6 +118,17 @@ public class FriendlyByteBuf extends ByteBuf {
      public <T> void writeJsonWithCodec(Codec<T> codec, T value, int maxLength) {
          // Paper end - Adventure; add max length parameter
          DataResult<JsonElement> dataResult = codec.encodeStart(JsonOps.INSTANCE, value);
@@ -93,7 +93,7 @@ index 1df628ac0b414511aaed6e09d78f884c4170f730..fc10d813e72322d185378453bc25546e
      }
  }
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 0eecc41b02f205022a717691a18114d5c091bc3d..481d56d6c43e04c0b180c7008329d8e8316b0d0c 100644
+index 42d8dcfc8bbdc6c043af4da9c452f388aa32d39f..9113ab33ba6047d6819d6645fe66d9063cdf511e 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -668,7 +668,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

divinemc-server/paper-patches/features/0003-Optimize-default-values-for-configs.patch

@@ -21,7 +21,7 @@ index 42777adb028fe282c1619aeb5431c442ad5df0d0..3afcf93d1e9519577ca9b6974f23f225
          public boolean strictAdvancementDimensionCheck = false;
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015cc6d321f0 100644
+index 4bc6a6572f18b333a3c48b2a96f3079998e7d77f..0d3f85fbd2d8817ea918803a275cafc0118c13b4 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 @@ -145,9 +145,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -66,7 +66,7 @@ index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015c
              @Comment("Prevents merging items that are not on the same y level, preventing potential visual artifacts.")
              public boolean onlyMergeItemsHorizontally = false;
              public PillagerPatrols pillagerPatrols;
-@@ -404,7 +404,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -407,7 +407,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Environment extends ConfigurationPart {
          public boolean disableThunder = false;
          public boolean disableIceAndSnow = false;
@@ -75,7 +75,7 @@ index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015c
          public boolean disableExplosionKnockback = false;
          public boolean generateFlatBedrock = false;
          public FrostedIce frostedIce;
-@@ -453,7 +453,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -456,7 +456,7 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Maps extends ConfigurationPart {
          public int itemFrameCursorLimit = 128;
@@ -84,7 +84,7 @@ index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015c
      }
  
      public Fixes fixes;
-@@ -479,7 +479,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -482,7 +482,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Hopper extends ConfigurationPart {
          public boolean cooldownWhenFull = true;
          public boolean disableMoveEvent = false;
@@ -93,7 +93,7 @@ index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015c
      }
  
      public Collisions collisions;
-@@ -487,9 +487,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -490,9 +490,9 @@ public class WorldConfiguration extends ConfigurationPart {
      public class Collisions extends ConfigurationPart {
          public boolean onlyPlayersCollide = false;
          public boolean allowVehicleCollisions = true;
@@ -105,7 +105,7 @@ index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015c
          public boolean allowPlayerCrammingDamage = false;
      }
  
-@@ -497,18 +497,31 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -500,18 +500,31 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Chunks extends ConfigurationPart {
          public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -147,7 +147,7 @@ index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015c
          });
          public boolean flushRegionsOnSave = false;
      }
-@@ -523,13 +536,13 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -526,13 +539,13 @@ public class WorldConfiguration extends ConfigurationPart {
      public TickRates tickRates;
  
      public class TickRates extends ConfigurationPart {
@@ -166,7 +166,7 @@ index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015c
      }
  
      @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
-@@ -538,7 +551,7 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -541,7 +554,7 @@ public class WorldConfiguration extends ConfigurationPart {
      public class FeatureSeeds extends ConfigurationPart {
          @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
          @Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -175,7 +175,7 @@ index a426ba82af695426952bb5e04fa721e6ccff2f89..6ae624f873c77625c7ff9a1b94ff015c
          @Setting(FeatureSeedsGeneration.FEATURES_KEY)
          public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
  
-@@ -559,9 +572,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -562,9 +575,9 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Misc extends ConfigurationPart {
          public int lightQueueSize = 20;

gradle.properties

@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
 
 mcVersion=1.21.4
 version=1.21.4-R0.1-SNAPSHOT
-purpurRef=62cbd47ac150737ffa98e6d691cd79e62a5f3302
+purpurRef=d41aaca10645bd51e1230e1edaa36c766fa1bcef
 experimental=false
 
 org.gradle.configuration-cache=true