Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@ab2f1c0 Explorer Map API (#1377)
PurpurMC/Purpur@b21daa9 Updated Upstream (Paper)
PurpurMC/Purpur@98b5804 some GUI stuff

gradle.properties

@@ -1,7 +1,7 @@
 group = gq.bxteam.divinemc
 
 version = 1.20.1-R0.1-SNAPSHOT
-purpurRef = 1a414a425fe6af2b2e7b2963cf7f8504c6dea1a1
+purpurRef = 98b58044f93f94c9f0a98c2b907d2fe66b9dea41
 
 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 15a0ae9744fa841e3e51e9e9a957cea8c71e68ad..aae4102b23e455516ddd80ed8f5ebd62b3e5d519 100644
+index 916b9a9f05c0e83109bc9a4eb1692e2ed6e81eaf..1381157b4a5a4878698ff5774733371c2d0c0bc5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2019,6 +2019,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2042,6 +2042,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Purpur end
  

patches/server/0001-Divine-Branding.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Divine Branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a125c0735cf4814b26ce8a96163bf65f74d23900..73b475f589efd2bcb4ed2d514fc5f73330b839f7 100644
+index 240394b1d9dd1449674a299aa73fa155be2d3d82..6f39b026ab819e05e544a4049bd766a5aa73b16a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -8,7 +8,7 @@ plugins {
+@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
  
  dependencies {
      // Purpur start
@@ -17,7 +17,7 @@ index a125c0735cf4814b26ce8a96163bf65f74d23900..73b475f589efd2bcb4ed2d514fc5f733
      implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
          exclude("io.papermc.paper", "paper-api")
      }
-@@ -87,7 +87,7 @@ tasks.jar {
+@@ -95,7 +95,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 7a388f0e57bc05634be64b16fa66acdb416ac849..1cb9c46f7fe41fa446e2ce6f641fcab4d9f9cf54 100644
+index 81aee45085a29ceb8e36d7948432e2ca688978c0..f6f60f98cc942b48aaea46f48ad7df7888a1f72e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
+@@ -264,7 +264,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 06fa43b469aea15dc64ce1866d08843327a34965..568f34e25e50382d393726e724b6f9d62891aa35 100644
+index b974b59d421cf97bc9547ea75fe4643d89639bc1..cb2cad9d695590a86470fdede78adf5ee0bcf0a7 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 fdd55ac3720d44e3d246e05fe9a07b5f73bed0e8..de4a7223c672953c5d02d222638af7f9
          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 babe609ba0129ce7884829e3228ad01201bb8056..437ec32a73eb3e887deca6e21f29820533296da9 100644
+index f6f60f98cc942b48aaea46f48ad7df7888a1f72e..6a2f4d7ec5d134485f9b90d960acf665cb51ac1d 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;
@@ -388,7 +388,7 @@ index babe609ba0129ce7884829e3228ad01201bb8056..437ec32a73eb3e887deca6e21f298205
  import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
  import java.awt.image.BufferedImage;
  import java.io.ByteArrayOutputStream;
-@@ -1068,6 +1069,7 @@ public final class CraftServer implements Server {
+@@ -1071,6 +1072,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
@@ -396,7 +396,7 @@ index babe609ba0129ce7884829e3228ad01201bb8056..437ec32a73eb3e887deca6e21f298205
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1084,6 +1086,7 @@ public final class CraftServer implements Server {
+@@ -1087,6 +1089,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.purpurConfig.init(); // Purpur
@@ -404,7 +404,7 @@ index babe609ba0129ce7884829e3228ad01201bb8056..437ec32a73eb3e887deca6e21f298205
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1100,6 +1103,7 @@ public final class CraftServer implements Server {
+@@ -1103,6 +1106,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
@@ -412,7 +412,7 @@ index babe609ba0129ce7884829e3228ad01201bb8056..437ec32a73eb3e887deca6e21f298205
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2934,6 +2938,13 @@ public final class CraftServer implements Server {
+@@ -2948,6 +2952,13 @@ public final class CraftServer implements Server {
          }
          // Purpur end
  
@@ -427,7 +427,7 @@ index babe609ba0129ce7884829e3228ad01201bb8056..437ec32a73eb3e887deca6e21f298205
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 257d7edd8216cbc983464fb5ca4887d6ede9a66d..6d13ca3c391771e989245f6f263f997e12297691 100644
+index 0bc9b176a3b86a5b4153a2110621534c692d8240..971d790ac333cb000c765434286ffcd9cd9085f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -187,6 +187,14 @@ public class Main {

patches/server/0006-Fix-MC-93826.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-93826
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-index 3977e59d9d248accc1d2946874960f1072e11a7b..f68c49c7ed84eb4cb61248e3347506fe7ed9a260 100644
+index 8773b1072016a3bbf025959e9ab827704ec17fc6..90ae72a1ccf4acbac08bba7a3c453da01d2f57b3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-@@ -40,6 +40,8 @@ public abstract class Animal extends AgeableMob {
+@@ -42,6 +42,8 @@ public abstract class Animal extends AgeableMob {
      @Nullable
      public UUID loveCause;
      public ItemStack breedItem; // CraftBukkit - Add breedItem variable
@@ -17,7 +17,7 @@ index 3977e59d9d248accc1d2946874960f1072e11a7b..f68c49c7ed84eb4cb61248e3347506fe
      public abstract int getPurpurBreedTime(); // Purpur
  
      protected Animal(EntityType<? extends Animal> type, Level world) {
-@@ -71,7 +73,11 @@ public abstract class Animal extends AgeableMob {
+@@ -73,7 +75,11 @@ public abstract class Animal extends AgeableMob {
                  double d1 = this.random.nextGaussian() * 0.02D;
                  double d2 = this.random.nextGaussian() * 0.02D;
  

patches/server/0018-Reduce-sensor-work.patch

@@ -7,10 +7,10 @@ Original project: Bloom-host/Petal
 Link: https://github.com/Bloom-host/Petal
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ba975b2fae383863ec731211f99d66731fa922c5..aa07817dfbcc1c6fc64757f9af1e50b12eadf9c1 100644
+index 0b08cf7b26731ffd6f3909342f4e3a92fe0c813e..c99ee6cd14b2d83ed1106d199b7f1a68a5165c8d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1038,20 +1038,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1037,20 +1037,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          if (entity != null) {

patches/server/0024-Bump-Dependencies.patch

@@ -1,21 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
-Date: Mon, 26 Jun 2023 07:02:23 +0300
+Date: Thu, 6 Jul 2023 17:03:31 +0300
 Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8c68259134895f19fa337e47c9a96f4bd5ca1e4a..09d816c16a02cd9eb163eb6aa19ca7c5f1b722fd 100644
+index 6f39b026ab819e05e544a4049bd766a5aa73b16a..6455172a5cd3bf9a7b27831c67249022e535cdba 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -24,13 +24,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.
-      */
--    implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
--    annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins
-+    implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation // DivineMC - bump dependencies
-+    annotationProcessor("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins // DivineMC - bump dependencies
+@@ -37,8 +37,8 @@ dependencies {
      implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol
      // Paper end
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
@@ -26,7 +19,7 @@ index 8c68259134895f19fa337e47c9a96f4bd5ca1e4a..09d816c16a02cd9eb163eb6aa19ca7c5
      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")
-@@ -39,7 +39,7 @@ dependencies {
+@@ -47,7 +47,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 +28,7 @@ index 8c68259134895f19fa337e47c9a96f4bd5ca1e4a..09d816c16a02cd9eb163eb6aa19ca7c5
          isTransitive = false
      }
      // Paper end
-@@ -59,9 +59,9 @@ dependencies {
+@@ -67,9 +67,9 @@ dependencies {
      }
      // Pufferfish end