Update Paper

gradle.properties

@@ -1,7 +1,7 @@
 group=org.leavesmc.leaves
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
-paperRef=edda0db18b0c9b0304e06fb167b218d1e1cf8d55
+paperRef=9421f223724576accdb94041ec3e4772d4acd670
 preVersion=true
 org.gradle.jvmargs=-Xmx2G
 org.gradle.caching=true

leaves-api/paper-patches/features/0003-Add-fakeplayer-api.patch

@@ -5,13 +5,14 @@ Subject: [PATCH] Add fakeplayer api
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9764489c0801eecb8bbfb06103607f0902bf23ab..8185c76052d7af4c2ea83805a9ee6c709148d3c3 100644
+index a371da9d1d9d1b6cb266db58b9f74a09dc858d2c..a5b316601b433544b604455dc1c8079bf478b43e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2980,6 +2980,17 @@ public final class Bukkit {
+@@ -2995,4 +2995,15 @@ public final class Bukkit {
+     public static void restart() {
+         server.restart();
      }
-     // Paper end - Folia region threading API
-
++
 +    // Leaves start - Bot API
 +    /**
 +     * Returns a bot manager.
@@ -22,12 +23,9 @@ index 9764489c0801eecb8bbfb06103607f0902bf23ab..8185c76052d7af4c2ea83805a9ee6c70
 +        return server.getBotManager();
 +    }
 +    // Leaves end - Bot API
-+
-     @NotNull
-     public static Server.Spigot spigot() {
-         return server.spigot();
+ }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fa6f9d50577059d99ee98662497f3fc049fa74ac..430fb104e3190ae0ef9a08627c7c0d0d636898c8 100644
+index d7ebfcfc6a41b7e94a041f7faf3c2d8090fab3c4..cc7c894572652b86b0069325e28f8e73f7a66f01 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -66,6 +66,7 @@ import org.jetbrains.annotations.ApiStatus;
@@ -38,7 +36,7 @@ index fa6f9d50577059d99ee98662497f3fc049fa74ac..430fb104e3190ae0ef9a08627c7c0d0d
 
  /**
   * Represents a server implementation.
-@@ -2658,4 +2659,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2698,4 +2699,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
      // Paper end - API to check if the server is sleeping

leaves-api/paper-patches/features/0006-Replay-Mod-API.patch

@@ -5,23 +5,22 @@ Subject: [PATCH] Replay Mod API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8185c76052d7af4c2ea83805a9ee6c709148d3c3..9564d2e3f3126104f73a1942ea5c45a69ebb158a 100644
+index a5b316601b433544b604455dc1c8079bf478b43e..b73c009ece3af3daf8251adb7502ee9c8ad103c4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2990,6 +2990,11 @@ public final class Bukkit {
+@@ -3006,4 +3006,10 @@ public final class Bukkit {
          return server.getBotManager();
      }
      // Leaves end - Bot API
++
 +    // Leaves start - Photographer API
 +    public static @NotNull org.leavesmc.leaves.entity.PhotographerManager getPhotographerManager() {
 +        return server.getPhotographerManager();
 +    }
 +    // Leaves end - Photographer API
-
-     @NotNull
-     public static Server.Spigot spigot() {
+ }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 430fb104e3190ae0ef9a08627c7c0d0d636898c8..991ec55218da08377bb71272fd6bca9f3bed0582 100644
+index cc7c894572652b86b0069325e28f8e73f7a66f01..632d510f4ae42c5bbb00320b517659c857ccded7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -67,6 +67,7 @@ import org.jetbrains.annotations.Contract;
@@ -32,10 +31,11 @@ index 430fb104e3190ae0ef9a08627c7c0d0d636898c8..991ec55218da08377bb71272fd6bca9f
 
  /**
   * Represents a server implementation.
-@@ -2668,4 +2669,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2708,4 +2709,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull BotManager getBotManager();
      // Leaves end - Bot API
++
 +    // Leaves start - Photographer API
 +    @NotNull PhotographerManager getPhotographerManager();
 +    // Leaves end - Photographer API

leaves-api/paper-patches/features/0007-Bytebuf-API.patch

@@ -5,27 +5,25 @@ Subject: [PATCH] Bytebuf API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9564d2e3f3126104f73a1942ea5c45a69ebb158a..63c90d151f4a50e2da63f640587d7041dcc1a8b6 100644
+index b73c009ece3af3daf8251adb7502ee9c8ad103c4..dfc3da5eef1b8c11c5deef3853e47a7f685f0d46 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2996,6 +2996,12 @@ public final class Bukkit {
+@@ -3012,4 +3012,10 @@ public final class Bukkit {
+         return server.getPhotographerManager();
      }
      // Leaves end - Photographer API
- 
++
 +    // Leaves start - Bytebuf API
 +    public static org.leavesmc.leaves.bytebuf.BytebufManager getBytebufManager() {
 +        return server.getBytebufManager();
 +    }
 +    // Leaves end - Bytebuf API
-+
-     @NotNull
-     public static Server.Spigot spigot() {
-         return server.spigot();
+ }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 991ec55218da08377bb71272fd6bca9f3bed0582..2590bc0813672ca566dfae734812de6a53519a1a 100644
+index 632d510f4ae42c5bbb00320b517659c857ccded7..ef91d117defb23b27a8ca01551753716dc24d184 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2672,4 +2672,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2713,4 +2713,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      // Leaves start - Photographer API
      @NotNull PhotographerManager getPhotographerManager();
      // Leaves end - Photographer API
@@ -35,7 +33,7 @@ index 991ec55218da08377bb71272fd6bca9f3bed0582..2590bc0813672ca566dfae734812de6a
 +    // Leaves end - Bytebuf API
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0081dd53b6a81ce7892e58d61f9f8a6718e30775..c706a782a1739b54af85d4b6a996bf1d5d571ba1 100644
+index 69f982d1dbffa256b65c32292805320452a9842f..9041dbf1aaa0a8f548b3122817cf6ef3b9c56ba2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3853,6 +3853,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

leaves-server/build.gradle.kts.patch

@@ -36,7 +36,7 @@
      spigot {
          buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
          packageVersion = "v1_21_R3" // also needs to be updated in MappingEnvironment
-@@ -101,7 +_,22 @@
+@@ -101,7 +_,21 @@
      }
  }
 
@@ -56,7 +56,6 @@
 +    java { srcDir("../paper-server/src/log4jPlugins/java") }
 +}
 +// Leaves end - build change
-+
  configurations.named(log4jPlugins.compileClasspathConfigurationName) {
      extendsFrom(configurations.compileClasspath.get())
  }
@@ -75,8 +74,8 @@
      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 +_,16 @@
-     implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
+@@ -177,6 +_,16 @@
+     implementation("me.lucko:spark-paper:1.10.119-20241121.092015-1")
  }
 
 +// Leaves start - hide irrelevant compilation warnings
@@ -92,7 +91,7 @@
  tasks.jar {
      manifest {
          val git = Git(rootProject.layout.projectDirectory.path)
-@@ -188,14 +_,14 @@
+@@ -189,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -112,22 +111,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -306,6 +_,14 @@
-     classpath(sourceSets.main.map { it.runtimeClasspath })
- }
-
-+// Leaves start - create config file
-+tasks.registerRunTask("createLeavesConfig") {
-+    description = "Create a new leaves.yml"
-+    mainClass = "org.leavesmc.leaves.config.GlobalConfigCreator"
-+    classpath(sourceSets.main.map { it.runtimeClasspath })
-+}
-+// Leaves end - create config file
-+
- tasks.registerRunTask("runBundler") {
-     description = "Spin up a test server from the Mojang mapped bundler jar"
-     classpath(tasks.createMojmapBundlerJar.flatMap { it.outputZip })
-@@ -316,13 +_,15 @@
+@@ -317,13 +_,23 @@
      classpath(tasks.createReobfBundlerJar.flatMap { it.outputZip })
      mainClass.set(null as String?)
  }
@@ -153,3 +137,11 @@
 +    mainClass.set(null as String?)
 +}
 +// Leaves end - build change
++
++// Leaves start - create config file
++tasks.registerRunTask("createLeavesConfig") {
++    description = "Create a new leaves.yml"
++    mainClass = "org.leavesmc.leaves.config.GlobalConfigCreator"
++    classpath(sourceSets.main.map { it.runtimeClasspath })
++}
++// Leaves end - create config file

leaves-server/minecraft-patches/features/0014-No-chat-sign.patch

@@ -28,10 +28,10 @@ index 47cb25aa9c37bd84d156288c397321009f1d9ae2..a94981882ac37ea215df3a71117d4a9b
          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..2e4b1883b0338cbb2a8767c7eafcf41558a55ae9 100644
+index d1daa3443446f47e2215f0c7c5823da58e053bab..60b39a320b795a320a28fd9c003ee948a0cc0208 100644
 --- a/net/minecraft/network/FriendlyByteBuf.java
 +++ b/net/minecraft/network/FriendlyByteBuf.java
-@@ -114,6 +114,14 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -118,6 +118,14 @@ 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);
@@ -91,7 +91,7 @@ index 1df628ac0b414511aaed6e09d78f884c4170f730..b92081d70ffeec47c304e553ce1aea0a
      }
  }
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 0c4e5aa382fed846a35badf903cab2756621a678..765521cae8bc1c65e3a390d018190646e39c4eb0 100644
+index 529a2caa2cde82bfdea7c173768fee32f5f21e49..a8775acd67db19ad671d2de252c0c553ee9f90ca 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -616,7 +616,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -133,7 +133,7 @@ index 46ffae71b5119c7c4527a21b19c8e822f4d87114..d3962942cfaf93e8a8f169f243a2cb3c
          if (packet == null || this.processedDisconnect) { // Spigot
              return;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 43e1ee3c9e02a1ea33fbd41604c92fe12726ae04..07a2dad0480d030fe198785fab2faa6108a38214 100644
+index f7db21ff9ce35f4a3b80e1e36366a1878605931b..787395860a7b5b8006725d8d8ebede5b72b01a22 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -1315,7 +1315,7 @@ public abstract class PlayerList {

leaves-server/minecraft-patches/features/0027-PCA-sync-protocol.patch

@@ -100,7 +100,7 @@ index 0f808855f58281578c2758513787f0f7330c9291..e31f55ad12160c8406c0ab719f593d4c
      protected Component getDefaultName() {
          return Component.translatable("container.barrel");
 diff --git a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 47582c2cbae227c47684b8451c7bac39bce7e0aa..56e65301adba14c0c8af161a7aa9049949ecaddc 100644
+index fbde2680b405b9fa7ed2fe70046b77e971b53e48..c3d02d115282bd6dff8b5616f1ce5571e678949d 100644
 --- a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -151,6 +151,11 @@ public class BeehiveBlockEntity extends BlockEntity {
@@ -138,7 +138,7 @@ index 47582c2cbae227c47684b8451c7bac39bce7e0aa..56e65301adba14c0c8af161a7aa90499
 +                    // Leaves end - pca
                  }
                  // Paper start - Fix bees aging inside; use exitTickCounter to keep actual bee life
-                 else {
+                 else if (level.paperConfig().entities.behavior.cooldownFailedBeehiveReleases) {
 @@ -372,6 +387,11 @@ public class BeehiveBlockEntity extends BlockEntity {
              this.maxBees = tag.getInt("Bukkit.MaxEntities");
          }
@@ -171,7 +171,7 @@ index 94f9477e78600eded6eecc4c961576501001d187..a9a85655aac78a0be91100e8b411a28e
 +    // Leaves end - pca
  }
 diff --git a/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-index afd9d657e3dc5715f22a49acb100412d00df7b7a..c59bf8a56e61cfcae064fc8a92d2c9840f733b77 100644
+index fd1075eadf39359c55162cf28cad2e3b08086d4a..4489db4f765a6154246be6127ff376244e8889a7 100644
 --- a/net/minecraft/world/level/block/entity/ChestBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/ChestBlockEntity.java
 @@ -198,6 +198,16 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement

leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch

@@ -34,7 +34,7 @@ index adc6741e0e017660fbd39a62b69be1e67e0e143f..9bc40b07b8eebded4f748fd053b45571
          if (nmsEntity.level() != this.getHandle().getLevel()) {
              nmsEntity = nmsEntity.teleport(new TeleportTransition(this.getHandle().getLevel(), nmsEntity, TeleportTransition.DO_NOTHING));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cbceeef584569a83bc5333b589da56ec7f939576..aecee9c1ecd7c929033bf0764f26c50f41e03ba1 100644
+index 5e3aa45b3b6d8ed6cc5f025fcea47638dbe591d8..f77549b7cfb432c3645638c7515b27a73a2e5a23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -315,6 +315,7 @@ public final class CraftServer implements Server {
@@ -62,7 +62,7 @@ index cbceeef584569a83bc5333b589da56ec7f939576..aecee9c1ecd7c929033bf0764f26c50f
              return false;
          }
 
-@@ -3293,4 +3295,11 @@ public final class CraftServer implements Server {
+@@ -3298,4 +3300,11 @@ public final class CraftServer implements Server {
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }
      // Paper end - API to check if the server is sleeping

leaves-server/paper-patches/features/0012-Replay-Mod-API.patch

@@ -19,7 +19,7 @@ index a0a6cde96322df8e455b26b32b1c593f332d4db6..b5031ba5c48c7d007a7c05766a2beff4
          }
          // Leaves end - skip bot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 16ebf43a97bcf325d101e8d99cce35a21c7ccdeb..99258ad5c0af91f24525bac9442cead9541c2e83 100644
+index f77549b7cfb432c3645638c7515b27a73a2e5a23..c0da73c9e97f2351bfbe28f4beef1e3444315da7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -316,6 +316,7 @@ public final class CraftServer implements Server {
@@ -39,7 +39,7 @@ index 16ebf43a97bcf325d101e8d99cce35a21c7ccdeb..99258ad5c0af91f24525bac9442cead9
              @Override
              public CraftPlayer apply(ServerPlayer player) {
                  return player.getBukkitEntity();
-@@ -3302,4 +3303,11 @@ public final class CraftServer implements Server {
+@@ -3307,4 +3308,11 @@ public final class CraftServer implements Server {
          return botManager;
      }
      // Leaves end - Bot API
@@ -52,7 +52,7 @@ index 16ebf43a97bcf325d101e8d99cce35a21c7ccdeb..99258ad5c0af91f24525bac9442cead9
 +    // Leaves end - replay mod api
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9131f13456e879bb2fee3fd5d77450df855011f2..f1c79b238b00f77cf2be1360d5a43429d3470896 100644
+index 2b441ba89c603903267db63c7515b0de2cbe09b1..81c8a0a236a892afd56b8fbc56427bb61b24ebcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -99,6 +99,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -64,7 +64,7 @@ index 9131f13456e879bb2fee3fd5d77450df855011f2..f1c79b238b00f77cf2be1360d5a43429
          // Special case complex part, since there is no extra entity type for them
          if (entity instanceof EnderDragonPart complexPart) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3260f20b667918dd7cd641d5d96688721fce2f9c..121560c873200390e261aef0f639f78a7a668883 100644
+index 218a27def751fb657cdeee102d9ec4b26025bb30..f746ec4e38a6191c68c35a98fb90dcadb349d837 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2258,7 +2258,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

leaves-server/paper-patches/features/0014-Bytebuf-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bytebuf API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2669b774ca837cb7f1a9e2ea924641f35841bf97..488e78a4408585bd4a309cbf5eead775f2223382 100644
+index c0da73c9e97f2351bfbe28f4beef1e3444315da7..a48cb07ba4cbbf3a6aacb982ff6cc654c55d9a50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -317,6 +317,7 @@ public final class CraftServer implements Server {
@@ -16,7 +16,7 @@ index 2669b774ca837cb7f1a9e2ea924641f35841bf97..488e78a4408585bd4a309cbf5eead775
 
      // Paper start - Folia region threading API
      private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
-@@ -3310,4 +3311,15 @@ public final class CraftServer implements Server {
+@@ -3315,4 +3316,15 @@ public final class CraftServer implements Server {
          return photographerManager;
      }
      // Leaves end - replay mod api