Updated Upstream (Paper/Gale)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@755a775 [ci skip] rebuild patches
PaperMC/Paper@3b9db2b Updated Upstream (Bukkit/CraftBukkit) (#11501)
PaperMC/Paper@c13f9fd Fix potential annotation testing interruption (#11460)
PaperMC/Paper@260c3bb Always send Banner patterns to the client (#11506)
PaperMC/Paper@14a48cd Some small touchups to the GUI (#11505)
PaperMC/Paper@d348cb8 Restrict BlockProjectileSource#launchProjectile

Gale Changes:
Dreeam-qwq/Gale@e893e3d Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.21.1
 version = 1.21.1-R0.1-SNAPSHOT
 
-galeCommit = 5fffc5ef3039544b345fd3e59f213078e7e8312e
+galeCommit = e893e3d762b729737b5cf5779b4428e4f5e3740e
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0003-Pufferfish-Sentry.patch

@@ -7,7 +7,7 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 64a5d2f43e6fb459ff30306467a4be1e2831c0b2..eccc64e2baa4c8d511b968f49ff23261f1c78f16 100644
+index 9369b3ba3c0f89924d7b40a397b58a8a102683d7..1cc87374beed7b4a2cfdd278b076e20b1e9febc8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -52,6 +52,7 @@ dependencies {
@@ -16,8 +16,8 @@ index 64a5d2f43e6fb459ff30306467a4be1e2831c0b2..eccc64e2baa4c8d511b968f49ff23261
      api("org.slf4j:slf4j-api:$slf4jVersion")
 +    api("io.sentry:sentry:5.4.0") // Pufferfish
  
-     implementation("org.ow2.asm:asm:9.7")
-     implementation("org.ow2.asm:asm-commons:9.7")
+     implementation("org.ow2.asm:asm:9.7.1")
+     implementation("org.ow2.asm:asm-commons:9.7.1")
 diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..c7772aac00f6db664f7a5673bc2585fa025e6aad

patches/api/0004-Purpur-API-Changes.patch

@@ -248,12 +248,12 @@ index 918a045165cdcde264bc24082b7afebb407271de..e98d6321c5f2cdde91b54f8a74cbcc04
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index de469f32dd9a01e0e2fde016044a783dde0c5b98..c7fa497381c5c5d57fda8b9c1ef26f2e89523f66 100644
+index 77a15a99e441bd81650806142581bd5b24f30e10..3ec2154956087a370799f0fa485f3b6cae894c69 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -5625,4 +5625,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-         }
-         return Registry.BLOCK.get(material.key);
+@@ -5636,4 +5636,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+     public BlockType asBlockType() {
+         return blockType.get();
      }
 +
 +    // Purpur start
@@ -1107,10 +1107,10 @@ index 7fbfdb07585c7b28acea1f0c1f58ada0cc744441..21fcca092e2e31baa5ece0de9e44e3fa
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index db5c7434a7e529727b556f314d5cd8e0534114fe..ec8a9225a45dd95b07b1d5d2f4eaf889178fc112 100644
+index 1db3742024e9cd1b70af2d52b4b756a544c019df..9c722a762c88a88bb5ef18c3b9eab8b371360dac 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -375,4 +375,14 @@ public interface Villager extends AbstractVillager {
+@@ -367,4 +367,14 @@ public interface Villager extends AbstractVillager {
       */
      public void clearReputations();
      // Paper end
@@ -1151,11 +1151,11 @@ index 14543c2238b45c526dd9aebea2aa5c22f5df54dc..5312daf33405704c74e2c9e109754285
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
-index 4b84c04675775e2a606630b00de8afe51665cebc..ccbaf40a3131f477b4be2264401ad893725c1162 100644
+index c73489f4b745bc84501ce94f0227b034d9768eae..a97129e71f16ec691759add664bdfd35ab90aaed 100644
 --- a/src/main/java/org/bukkit/entity/Wolf.java
 +++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -112,4 +112,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
-             return variant;
+@@ -108,4 +108,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
+             return Registry.WOLF_VARIANT.getOrThrow(NamespacedKey.minecraft(key));
          }
      }
 +
@@ -1806,10 +1806,10 @@ index f1aa67997f904953742e8895e49341c2f73d44a2..993cf7995514fb0ef3c4388bb3ce49c3
          public int hashCode() {
              int hash = 7;
 diff --git a/src/main/java/org/bukkit/inventory/view/AnvilView.java b/src/main/java/org/bukkit/inventory/view/AnvilView.java
-index cc5ffd28a6d6244b99a94e52c6f5a0f73a64aed7..76e2b4fe49febb2897e1e9c5487a6b1e2e6bd76a 100644
+index 3c1aa1e036bee08304c1cdca59f6a5bc0ba306c0..709fb2d1c7e3253034a651a9f68c003601b598a4 100644
 --- a/src/main/java/org/bukkit/inventory/view/AnvilView.java
 +++ b/src/main/java/org/bukkit/inventory/view/AnvilView.java
-@@ -83,4 +83,34 @@ public interface AnvilView extends InventoryView {
+@@ -89,4 +89,34 @@ public interface AnvilView extends InventoryView {
       */
      void bypassEnchantmentLevelRestriction(boolean bypassEnchantmentLevelRestriction);
      // Paper end - bypass anvil level restrictions
@@ -3551,7 +3551,7 @@ index 0000000000000000000000000000000000000000..cbdad4cf09c170064a45644efdf7aa0b
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 88d5db2995829cba919d78f988d5c735cf70cb1b..494ba7e7bfe2c73d6ea3a348f023372f23a62b1c 100644
+index f9e4b16a21d6cc6c9cbbe06d20c8af25e72e3ddb..4028b230e7fe1c78520f227a377a2a61e8381ecc 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -47,6 +47,10 @@ public class AnnotationTest {

patches/api/0006-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 869f13a4a520c41248fe3d9e6709c637e292a53e..322074316689c220eb49cf7857923f1913479d35 100644
+index 1cc87374beed7b4a2cfdd278b076e20b1e9febc8..936f9ac01b576c56ccd9f39c6c0e32d335ee3952 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,8 +12,10 @@ java {
@@ -53,8 +53,8 @@ index 869f13a4a520c41248fe3d9e6709c637e292a53e..322074316689c220eb49cf7857923f19
 -    api("io.sentry:sentry:5.4.0") // Pufferfish
 +    api("io.sentry:sentry:8.0.0-alpha.4") // Pufferfish // Leaf - Bump Dependencies
  
-     implementation("org.ow2.asm:asm:9.7")
-     implementation("org.ow2.asm:asm-commons:9.7")
+     implementation("org.ow2.asm:asm:9.7.1")
+     implementation("org.ow2.asm:asm-commons:9.7.1")
      // Paper end
  
 -    api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
@@ -81,14 +81,13 @@ index 869f13a4a520c41248fe3d9e6709c637e292a53e..322074316689c220eb49cf7857923f19
 -    testImplementation("org.apache.commons:commons-lang3:3.12.0")
 -    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 -    testImplementation("org.hamcrest:hamcrest:2.2")
--    testImplementation("org.mockito:mockito-core:5.11.0")
 +    // Leaf start - Bump Dependencies
 +    testImplementation("org.apache.commons:commons-lang3:3.16.0")
 +    testImplementation("org.junit.jupiter:junit-jupiter:5.11.0")
 +    testImplementation("org.hamcrest:hamcrest:3.0")
-+    testImplementation("org.mockito:mockito-core:5.12.0")
+     testImplementation("org.mockito:mockito-core:5.14.1")
 +    // Leaf end - Bump Dependencies
-     testImplementation("org.ow2.asm:asm-tree:9.7")
+     testImplementation("org.ow2.asm:asm-tree:9.7.1")
 +
 +    // Leaf - Bump Dependencies
 +    // commons-lang3 is removed in maven-resolver-provider since 3.9.8

patches/removed/server/0069-Fix-NPE-during-creating-GUI-graph.patch

@@ -3,6 +3,7 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
 Date: Tue, 27 Feb 2024 03:27:48 -0500
 Subject: [PATCH] Fix NPE during creating GUI graph
 
+Removed in 1.21.1, Paper fixed it
 
 diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
 index 7c32c60100cf2bd109eb8762efa856c10b704fdd..81d40895cfa84676f5b200f53b128d9d6c5bc0bd 100644

patches/server/0001-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b5f42cf2f6bb68b1f0f7a6666371ec84f00c4cf6..58663d658394704eda5193d60ed8d412c4845fae 100644
+index 5ebc35cadc960d428e8a91642ddce0875078d790..4426855192b7dcc58b16d41b8a9d44bbbed3b55f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -17,7 +17,7 @@ index b5f42cf2f6bb68b1f0f7a6666371ec84f00c4cf6..58663d658394704eda5193d60ed8d412
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -94,14 +94,14 @@ tasks.jar {
+@@ -95,14 +95,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -188,10 +188,10 @@ index bdfb969f88e68d89a5cad4b145bbc1441a110bac..fba0558f46516f65c678635359f305f8
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 138e062d18d85702f4af8ac896ec26b10951fa5d..4f65503d9989530bd34734d27d30699df93c24cc 100644
+index 4d0de69b730599d7a89903dd862b89d51ba79e1b..ebf68793373b128e63960e1c60a22d71a46a6b4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -483,7 +483,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -489,7 +489,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

patches/server/0011-Purpur-Server-Changes.patch

@@ -32,7 +32,7 @@ Make-pufferfish-config-relocatable.patch
 MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9783e7800d060d0daab25b37b86cbbd811e02f65..102a4f8e0cb05eeffac116c98c5b25db02e6b245 100644
+index 78d29b5e5047f9f03d1b8e93047953e727611c5e..0d250a691a0f28770cbd9f847d8cd00af866b583 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -54,6 +54,12 @@ dependencies {
@@ -47,8 +47,8 @@ index 9783e7800d060d0daab25b37b86cbbd811e02f65..102a4f8e0cb05eeffac116c98c5b25db
 +
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
-     testImplementation("org.hamcrest:hamcrest:2.2")
-@@ -165,7 +171,7 @@ fun TaskContainer.registerRunTask(
+     testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0")
+@@ -170,7 +176,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -13902,7 +13902,7 @@ index 06497b5141e611cc7a1b6030a7b9c54b5c4eda06..28df1b3230762e52b5458ac93a85c9a5
                  return InteractionResult.PASS;
              }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index e46e7c3e919a7f12ccf135dceec911b1fec9e0f2..9b17400f29d445c0afccf9ec423143024605a200 100644
+index d37c915a4173ef16f3cd26339825862950ce52dd..933b7519da5330ea8acd05c337201f52cab12c3c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -497,6 +497,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -16891,7 +16891,7 @@ index 94ca0407303c4493ab4928b12ec6ecc75aaca549..a138e1b6b66d99f2035de054137a607a
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a38ea05b1 100644
+index d2cc2d8ce298621c1e2f197ce260ab0174d0948f..bfc4d11b09696d85ea0fd74d9656069473a5821d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -415,6 +415,20 @@ public final class CraftServer implements Server {
@@ -16915,7 +16915,7 @@ index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a
  
          CraftRegistry.setMinecraftRegistry(console.registryAccess());
  
-@@ -1075,6 +1089,7 @@ public final class CraftServer implements Server {
+@@ -1077,6 +1091,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          this.console.galeConfigurations.reloadConfigs(this.console); // Gale - Gale configuration
@@ -16923,7 +16923,7 @@ index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a
          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))
-@@ -1090,6 +1105,7 @@ public final class CraftServer implements Server {
+@@ -1092,6 +1107,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -16931,7 +16931,7 @@ index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1107,6 +1123,7 @@ public final class CraftServer implements Server {
+@@ -1109,6 +1125,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          this.spark.registerCommandBeforePlugins(this); // Paper - spark
@@ -16939,7 +16939,7 @@ index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -1617,6 +1634,55 @@ public final class CraftServer implements Server {
+@@ -1619,6 +1636,55 @@ public final class CraftServer implements Server {
          return true;
      }
  
@@ -16995,7 +16995,7 @@ index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a
      @Override
      public List<Recipe> getRecipesFor(ItemStack result) {
          Preconditions.checkArgument(result != null, "ItemStack cannot be null");
-@@ -3005,6 +3071,18 @@ public final class CraftServer implements Server {
+@@ -3007,6 +3073,18 @@ public final class CraftServer implements Server {
          }
          // Gale end - Gale configuration - API
  
@@ -17014,7 +17014,7 @@ index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a
          @Override
          public void restart() {
              org.spigotmc.RestartCommand.restart();
-@@ -3287,4 +3365,15 @@ public final class CraftServer implements Server {
+@@ -3289,4 +3367,15 @@ public final class CraftServer implements Server {
      }
      // Gale end - YAPFA - last tick time - API
  
@@ -17031,7 +17031,7 @@ index 5dbaaa949976051d7926fe24203777bd66f9189c..91548197ef6665e271a9104fd2cb8a3a
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d59a65c35da65196b3487da08707267e2ca48a65..c701687e964477b34cd73e614d3ec31d3f11f218 100644
+index 25aa3d0f9b44737059b567c802e33bd6261f2c8a..617c386290e525e2e81fe0e7b6d1f0b16ef8d109 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2386,6 +2386,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -17084,7 +17084,7 @@ index d59a65c35da65196b3487da08707267e2ca48a65..c701687e964477b34cd73e614d3ec31d
      public Collection<GeneratedStructure> getStructures(int x, int z) {
          return this.getStructures(x, z, struct -> true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c63dfc0b740ce2e544ad920188d7d7dfc2ae3e04..95dc6e535b1e8ef6d58a64df814286ce5df8dc08 100644
+index d9b4ab99ef6bf232b78ac162c3cf3a6b47a7bae2..284c500871e4f880da415a51979fe26b88a4744e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -176,6 +176,14 @@ public class Main {
@@ -17410,10 +17410,10 @@ index 30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02..5c1cda88080850314dac196dbe71ff12
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4750df7354ccb5afd0910efe0415f3a2eb19a546..b21cd824587f7bed53255f7d0fc7bedefd45f9a4 100644
+index 57b71a3894638253c6d24d4967a96768834bb02b..491c320d3745587757ddc9131a7585275e35d0c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -513,7 +513,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -514,7 +514,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          net.minecraft.server.level.ServerPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle();
          getHandle().lastHurtByPlayer = entityPlayer;
          getHandle().lastHurtByMob = entityPlayer;
@@ -18113,10 +18113,10 @@ index c76c78bb7757d407102271463e14716a1b012deb..458b91582a22fb1e6deb1551c38d2a10
          } else if (bukkit == RecipeChoice.empty()) {
              stack = Ingredient.EMPTY;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
-index 59f0b1207931a2a10d559f43e2926b17e6991257..02cef3b940822327e72c887f6b342c080c6d0f45 100644
+index f86c95a13dff012de5db3e41ac261e9e8d44d9f3..1db0b790d824e419bb5fb6ab1f3003e120f9763b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java
-@@ -75,4 +75,26 @@ public class CraftAnvilView extends CraftInventoryView<AnvilMenu> implements Anv
+@@ -75,4 +75,26 @@ public class CraftAnvilView extends CraftInventoryView<AnvilMenu, AnvilInventory
              this.setMaximumRepairCost(legacy.getMaximumRepairCost());
          }
      }
@@ -24818,10 +24818,10 @@ index d2a75850af9c6ad2aca66a5f994f1b587d73eac4..a056aa167887abef9e6d531a9edd2cda
          <TerminalConsole name="TerminalConsole">
              <PatternLayout>
 diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-index ca71c688b37ce2c8b712a4f9216cf872c8edf78e..83f2c04d083eced64bc67661eed0ddfdddc497cc 100644
+index 75ed5050f72c001d6eab117a2c0b352a413548bd..180c0a532bbac10a8280b63eb7aa783a1bfbb237 100644
 --- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
 +++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-@@ -45,6 +45,7 @@ public class MinecraftCommandPermissionsTest extends AbstractTestingBase {
+@@ -46,6 +46,7 @@ public class MinecraftCommandPermissionsTest {
          Set<String> foundPerms = new HashSet<>();
          for (CommandNode<CommandSourceStack> child : root.getChildren()) {
              final String vanillaPerm = VanillaCommandWrapper.getPermission(child);
@@ -24829,7 +24829,7 @@ index ca71c688b37ce2c8b712a4f9216cf872c8edf78e..83f2c04d083eced64bc67661eed0ddfd
              if (!perms.contains(vanillaPerm)) {
                  missing.add("Missing permission for " + child.getName() + " (" + vanillaPerm + ") command");
              } else {
-@@ -57,6 +58,25 @@ public class MinecraftCommandPermissionsTest extends AbstractTestingBase {
+@@ -58,6 +59,25 @@ public class MinecraftCommandPermissionsTest {
      }
  
      private static final List<String> TO_SKIP = List.of(

patches/server/0015-Remove-Timings.patch

@@ -1639,7 +1639,7 @@ index 4aa33233060b2b2bd809d92d35bd0933cb015d41..5ad94cabbab741d69363d40df359075d
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 91548197ef6665e271a9104fd2cb8a3a38ea05b1..f29b9be2a7ab617191161e1ff2a16b5a3d3c7b3b 100644
+index bfc4d11b09696d85ea0fd74d9656069473a5821d..229075a7c676f71a758506aca5974f19b940e67e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -478,7 +478,6 @@ public final class CraftServer implements Server {
@@ -1650,7 +1650,7 @@ index 91548197ef6665e271a9104fd2cb8a3a38ea05b1..f29b9be2a7ab617191161e1ff2a16b5a
          this.overrideSpawnLimits();
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
          this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose"));
-@@ -1035,10 +1034,8 @@ public final class CraftServer implements Server {
+@@ -1036,10 +1035,8 @@ public final class CraftServer implements Server {
              commands.performCommand(results, commandLine, commandLine, true);
          } catch (CommandException ex) {
              this.pluginManager.callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
@@ -1789,10 +1789,10 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index d2c34cc068ac7943844ad38ac92d2af774e211fa..3786f6944b0b025c33749c301c2d11b33311a02a 100644
+index ebf68793373b128e63960e1c60a22d71a46a6b4e..7d53a86c5aa5a1eeeb26dbc56e5f104729806d20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -199,9 +199,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -201,9 +201,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
      // ========================================================================
      // Paper start
      @Override
@@ -1803,7 +1803,7 @@ index d2c34cc068ac7943844ad38ac92d2af774e211fa..3786f6944b0b025c33749c301c2d11b3
      // Paper end
  
      public static byte toLegacyData(BlockState data) {
-@@ -478,7 +476,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -484,7 +482,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
      // Paper start
      @Override
      public String getTimingsServerName() {

patches/server/0016-Bump-Dependencies.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Bump Dependencies
 TODO - Dreeam: Bump & test dependencies, impl new features?
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 102a4f8e0cb05eeffac116c98c5b25db02e6b245..32cebbf591b2f822ec32080aa8451f85c64b6787 100644
+index 0d250a691a0f28770cbd9f847d8cd00af866b583..86c4b60c478817001d622397972ddc1ce3a59a55 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -22,7 +22,7 @@ dependencies {
@@ -35,7 +35,7 @@ index 102a4f8e0cb05eeffac116c98c5b25db02e6b245..32cebbf591b2f822ec32080aa8451f85
 -    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.23.1") // Paper - remove exclusion
 +    // Leaf end - Bump Dependencies
-     implementation("org.ow2.asm:asm-commons:9.7")
+     implementation("org.ow2.asm:asm-commons:9.7.1")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
 -    runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0")
@@ -61,22 +61,23 @@ index 102a4f8e0cb05eeffac116c98c5b25db02e6b245..32cebbf591b2f822ec32080aa8451f85
  
      // Purpur start
      implementation("org.mozilla:rhino-runtime:1.7.15")
-@@ -60,10 +64,10 @@ dependencies {
+@@ -60,11 +64,11 @@ dependencies {
      implementation("dev.omega24:upnp4j:1.0")
      // Purpur end
  
 -    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
 -    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
--    testImplementation("org.hamcrest:hamcrest:2.2")
--    testImplementation("org.mockito:mockito-core:5.11.0")
 +    testImplementation("io.github.classgraph:classgraph:4.8.175") // Paper - mob goal test // Leaf - Bump Dependencies
 +    testImplementation("org.junit.jupiter:junit-jupiter:5.11.0") // Leaf - Bump Dependencies
+     testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0")
+-    testImplementation("org.hamcrest:hamcrest:2.2")
+-    testImplementation("org.mockito:mockito-core:5.14.1")
 +    testImplementation("org.hamcrest:hamcrest:3.0")
-+    testImplementation("org.mockito:mockito-core:5.12.0") // Leaf - Bump Dependencies
-     testImplementation("org.ow2.asm:asm-tree:9.7")
++    testImplementation("org.mockito:mockito-core:5.14.") // Leaf - Bump Dependencies
+     testImplementation("org.ow2.asm:asm-tree:9.7.1")
      testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
      implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
-@@ -78,6 +82,8 @@ dependencies {
+@@ -79,6 +83,8 @@ dependencies {
      implementation("me.lucko:spark-api:0.1-20240720.200737-2")
      implementation("me.lucko:spark-paper:1.10.105-SNAPSHOT")
      // Paper end - spark
@@ -85,7 +86,7 @@ index 102a4f8e0cb05eeffac116c98c5b25db02e6b245..32cebbf591b2f822ec32080aa8451f85
  }
  
  paperweight {
-@@ -271,3 +277,8 @@ sourceSets {
+@@ -276,3 +282,8 @@ sourceSets {
      }
  }
  // Gale end - package license into jar

patches/server/0030-Leaves-Protocol-Core.patch

@@ -107,10 +107,10 @@ index 6923684e361fa4e5e414a1b78192dcdd05377d36..70bdd37ba326fc2a74dc273784fd1126
          org.purpurmc.purpur.task.BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
          ServerLevel worldserver = entityplayer.serverLevel();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f29b9be2a7ab617191161e1ff2a16b5a3d3c7b3b..b1d269588f7df320d079f1456ffc188bf8af1716 100644
+index 229075a7c676f71a758506aca5974f19b940e67e..c872b29c638cb8a2bd2fa021398dd5d886928b94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -493,6 +493,7 @@ public final class CraftServer implements Server {
+@@ -494,6 +494,7 @@ public final class CraftServer implements Server {
          this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
          this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark
@@ -118,7 +118,7 @@ index f29b9be2a7ab617191161e1ff2a16b5a3d3c7b3b..b1d269588f7df320d079f1456ffc188b
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1123,6 +1124,7 @@ public final class CraftServer implements Server {
+@@ -1125,6 +1126,7 @@ public final class CraftServer implements Server {
          org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");

patches/server/0037-Leaves-Replay-Mod-API.patch

@@ -415,7 +415,7 @@ index df9f87ff656dbc80f934f35ff45e6de5905f7b7e..509cf388b501fc446dc9bcd8e79bd701
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b1d269588f7df320d079f1456ffc188bf8af1716..bdecd0fdd56f91072fc2eb5768857a607b40bbb9 100644
+index c872b29c638cb8a2bd2fa021398dd5d886928b94..1628f125f82d3dcffcf6b11ce4dbf27ba3fafe63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -320,6 +320,8 @@ public final class CraftServer implements Server {
@@ -436,7 +436,7 @@ index b1d269588f7df320d079f1456ffc188bf8af1716..bdecd0fdd56f91072fc2eb5768857a60
              @Override
              public CraftPlayer apply(ServerPlayer player) {
                  return player.getBukkitEntity();
-@@ -3375,4 +3377,11 @@ public final class CraftServer implements Server {
+@@ -3377,4 +3379,11 @@ public final class CraftServer implements Server {
          return getServer().lagging;
      }
      // Purpur end

patches/server/0067-Including-5s-in-getTPS.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Including 5s in getTPS()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bdecd0fdd56f91072fc2eb5768857a607b40bbb9..72e3db6b666913c20e5435bb606fb506a74458da 100644
+index 1628f125f82d3dcffcf6b11ce4dbf27ba3fafe63..3521b22d8fee6d4b2e901c989e59e5197c01ca80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3112,6 +3112,8 @@ public final class CraftServer implements Server {
+@@ -3114,6 +3114,8 @@ public final class CraftServer implements Server {
  
      @Override
      public double[] getTPS() {

patches/server/0073-Cache-player-profileResult.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache player profileResult
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e16e9b3b815065ed4aae1965edc3a68471470ec5..57f309dc5259a4ca935c12c99e835734cf2480c7 100644
+index f1f6e53dfb1c4646b4eb2e122309ff5d7f06cb45..d7a72ae0f8bb0fadf304da62e6a3ca7cd03770fa 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -26,6 +26,10 @@ dependencies {

patches/server/0075-Matter-Secure-Seed.patch

@@ -46,7 +46,7 @@ index 74bf36f75b59b1e21b72afcf653447864d7c3f80..ef2d70c1bd21cff6a080205c38bbe8bf
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f3190e4b548769f56f07bae06204bb18dbc88ece..d57e814fd353903ed6fcec59802acb9c3455bd96 100644
+index 9ef8919e4cdac61e2e4dd2fe96aed96cb1d5959e..f3c86193df3b7e1802f1e6fb91ba87506c834d79 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -559,6 +559,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -450,10 +450,10 @@ index 45e262308aebafa377a2353661acdd122933b99e..96b9e91997bba777ebe868ca5ab5e5e9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 72e3db6b666913c20e5435bb606fb506a74458da..5fc580f4a0cd3b5a2a3a3e787177270fcef25aa7 100644
+index 3521b22d8fee6d4b2e901c989e59e5197c01ca80..748501ec2ecbabd695b7ebf5d5650cb96fbfb5cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1402,7 +1402,11 @@ public final class CraftServer implements Server {
+@@ -1404,7 +1404,11 @@ public final class CraftServer implements Server {
              iregistrycustom_dimension = leveldataanddimensions.dimensions().dimensionsRegistryAccess();
          } else {
              LevelSettings worldsettings;

patches/server/0097-Optimize-LeavesProtocolManager-init-protocol.patch

@@ -190,7 +190,7 @@ index ed8d9888a24d3ae6cf8fe2f8b269554102e451df..1bdd77078c7345db1a675fbdc26b37e9
          }
      }
 diff --git a/src/main/java/org/leavesmc/leaves/protocol/ChatImageProtocol.java b/src/main/java/org/leavesmc/leaves/protocol/ChatImageProtocol.java
-index 25f893aad5c7fa289f484355635f528cb2e17459..1cc499393256e4eaaf2333076201fb702606462d 100644
+index 5ef387ccfe19bb91bbcb926d44e7a01450035a1d..1ddafae8b8c3d5c0f12bb12dc01d09ecaa5d68cf 100644
 --- a/src/main/java/org/leavesmc/leaves/protocol/ChatImageProtocol.java
 +++ b/src/main/java/org/leavesmc/leaves/protocol/ChatImageProtocol.java
 @@ -30,7 +30,12 @@ public class ChatImageProtocol {