Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:

gradle.properties

@@ -1,7 +1,7 @@
 group = gq.bxteam.divinemc
 
-version = 1.20-R0.1-SNAPSHOT
-purpurRef = 788c14f02c029f8c4cb39ac259acf8acd84141e3
+version = 1.20.1-R0.1-SNAPSHOT
+purpurRef = cc465d63cd35d2bd5e8474cdc1a29728699afc28
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Divine-Configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 96160bced90bb4cd84e48c85c645cad0eb672b85..9094774ed7b9ede35e5fcfeeaf8d7883a80e48a7 100644
+index 15a0ae9744fa841e3e51e9e9a957cea8c71e68ad..aae4102b23e455516ddd80ed8f5ebd62b3e5d519 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2006,6 +2006,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2019,6 +2019,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Purpur end
  

patches/server/0001-Divine-Branding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 59b94c7a3ca821c90adea832f97ece8a32f65034..d2f1136aa99778887de794803c25a2a33e7a6ba4 100644
+index af58d80d3c031dc00f8ac0e17b6a862b17eab97d..6b9e1fba27a79a7d07b0564f26ac8a24eb382d70 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,7 +8,7 @@ plugins {
@@ -17,7 +17,7 @@ index 59b94c7a3ca821c90adea832f97ece8a32f65034..d2f1136aa99778887de794803c25a2a3
      implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
          exclude("io.papermc.paper", "paper-api")
      }
-@@ -70,7 +70,7 @@ tasks.jar {
+@@ -71,7 +71,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -138,10 +138,10 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 06ded97822e9a51bf6aea377e59013a0717664e3..c7194ad0f93161ced583b9c8baa33d6bdbe07637 100644
+index 1dc6ebca645dc129b9ae12a2df68ad60e43ff71f..ccf43d3d4fdb74b713d788f62d6a9b453701f6fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
+@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -164,7 +164,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..627ceea9fa0fccd3e466eb34d59e760b
  
          if (stream != null) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index be8b44daa0141151c973917a774aa07721647ed1..0b2a5dc43ccba7d223cbdfd3f1dc539a6dab0444 100644
+index 06fa43b469aea15dc64ce1866d08843327a34965..568f34e25e50382d393726e724b6f9d62891aa35 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -229,7 +229,7 @@ public class PurpurConfig {

patches/server/0002-Divine-Configuration.patch

@@ -377,7 +377,7 @@ index 5287a6fe5742bdfe179fe669ee1f1edfbbd0fae6..454ad3442076898dd476d86706f93fac
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c7194ad0f93161ced583b9c8baa33d6bdbe07637..e034a0bca8b069a4817e5514d8d057f6b2d5a32d 100644
+index ccf43d3d4fdb74b713d788f62d6a9b453701f6fb..a84dc72b69bfcbb12241b9dc5649ae074dc829a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
@@ -412,7 +412,7 @@ index c7194ad0f93161ced583b9c8baa33d6bdbe07637..e034a0bca8b069a4817e5514d8d057f6
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2838,6 +2842,13 @@ public final class CraftServer implements Server {
+@@ -2855,6 +2859,13 @@ public final class CraftServer implements Server {
          }
          // Purpur end
  

patches/server/0004-Optimize-default-values-for-configs.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize default values for configs
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 77d05f7efdcdceef681a75692c208075d873d368..3b5d2fb24c6b463a4bd9d677ceae7dc44334ec36 100644
+index ffbab76e55807f04ebb25242eadbea114004b1b3..6244886926b41cf62ec02bb63af6e13d886a0c70 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -52,7 +52,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -17,7 +17,7 @@ index 77d05f7efdcdceef681a75692c208075d873d368..3b5d2fb24c6b463a4bd9d677ceae7dc4
          public boolean serverNamePrivacy = false;
          public List<String> hiddenConfigEntries = List.of(
              "database",
-@@ -265,9 +265,9 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -264,9 +264,9 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean fixEntityPositionDesync = true;
          public boolean loadPermissionsYmlBeforePlugins = true;
          @Constraints.Min(4)

patches/server/0007-Fix-entity-serialization.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix entity serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6417fd26d7675c967986055067ce8876a1263e9f..ff8258b1146d2899037a1fbd0ebc985df342eff4 100644
+index a3305c9378bd7e4c24bc2e447cb1f47ccc0db0b4..b5e925377a0014e017d44b0d3436c10c5c86bb32 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2288,15 +2288,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -25,10 +25,10 @@ index 6417fd26d7675c967986055067ce8876a1263e9f..ff8258b1146d2899037a1fbd0ebc985d
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 09c39f72fe1e8e6967f415dfd0d7aea8e50d0379..35f01d3c4d4318383ecd8a08b378285fffe07d62 100644
+index b0dedc0883475fc2ecb9b3a22c43eb5d3b312dbe..0f28e6f0499ee427c5a0f82f04672d7ec16de00b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -498,8 +498,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -496,8 +496,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
          Preconditions.checkNotNull(entity, "null cannot be serialized");
          Preconditions.checkArgument(entity instanceof org.bukkit.craftbukkit.entity.CraftEntity, "only CraftEntities can be serialized");
  

patches/server/0022-Do-not-process-chat-commands-before-player-has-joine.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Do not process chat/commands before player has joined
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9dfc12ccf53f5b4d4432bd89449b09504f3a2285..25e05aebf764dc36ca27f8a08c061c163195752f 100644
+index 9b2d2f5e45cf26ddd9897db5cfec23634e5d6cb3..d167d5ceeaca62e23b86c7a7229533d9ed54bedc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2424,6 +2424,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2427,6 +2427,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca
              }); // Paper - push to main
              return Optional.empty();

patches/server/0025-Bump-Dependencies.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d2f1136aa99778887de794803c25a2a33e7a6ba4..45b25816543029e91ac72201c71d72350eacac6c 100644
+index 6b9e1fba27a79a7d07b0564f26ac8a24eb382d70..ad268607c5be6db4751a37f9c916e0af80278350 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -22,13 +22,13 @@ dependencies {
+@@ -23,13 +23,13 @@ dependencies {
            all its classes to check if they are plugins.
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
@@ -26,7 +26,7 @@ index d2f1136aa99778887de794803c25a2a33e7a6ba4..45b25816543029e91ac72201c71d7235
      testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
      implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
-@@ -37,7 +37,7 @@ dependencies {
+@@ -38,7 +38,7 @@ dependencies {
      runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
      // Paper start - Use Velocity cipher
@@ -35,7 +35,7 @@ index d2f1136aa99778887de794803c25a2a33e7a6ba4..45b25816543029e91ac72201c71d7235
          isTransitive = false
      }
      // Paper end
-@@ -50,9 +50,9 @@ dependencies {
+@@ -51,9 +51,9 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")