Updated Upstream (Gale/Purpur/Dependencies)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.20.4-R0.1-SNAPSHOT
 
-galeCommit = 8a9cf6a7d5ce651518518f8bd06b1c213a2b0290
+galeCommit = 997dad5e84bf241739466a2495ad3b25a44b7ee0
 
 org.gradle.caching = true
 org.gradle.parallel = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 642956fe6151a87488d861ccb98e4d46d355d599
+Commit: b7e80840c6a96e1132bb0eb01ef34233334461d4
 
 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
@@ -786,10 +786,10 @@ index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c
      // Paper start
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d9929d9311e4b2b0ae13a8f6f13563257263f298..9fee171108e335827c5c164144284eb5a598742c 100644
+index 967125e99adc1b5446f42811d60ef44ba56ef5f5..644f58eeef73bab67ab50b16b87e7c2e798ea2c0 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1104,4 +1104,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1138,4 +1138,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull String getScoreboardEntryName();
      // Paper end - entity scoreboard name
@@ -925,10 +925,10 @@ index bcc6ba95bd21c7972865838c636a03f50b6c1f1a..c3fcd8dd7dbb1e1a18e17c014c1e6411
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e67455efc84f1e06d3396291d104ce65fee4591b..744b869c028324d5de30d2d64ab080b050fa3c47 100644
+index 5cb82901a5d0c8ee673501fc53389d526d4a5b6f..91ce069e4f23a115a01b329dcf053ed19dfb83bc 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1310,4 +1310,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1312,4 +1312,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
      // Paper end

patches/api/0005-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..a44f86f4be8db0c65de630d1bb2b1d47e6a8102f 100644
+index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..ff15203aa5f18ced362d1d6e5d10ed5fa3b90b40 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,11 +9,11 @@ java {
@@ -19,7 +19,7 @@ index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..a44f86f4be8db0c65de630d1bb2b1d47
 -val slf4jVersion = "2.0.9"
 -val log4jVersion = "2.17.1"
 +val slf4jVersion = "2.0.12" // Leaf - Bump Dependencies
-+val log4jVersion = "2.23.0" // Leaf - Bump Dependencies
++val log4jVersion = "2.23.1" // Leaf - Bump Dependencies
  val apiAndDocs: Configuration by configurations.creating {
      attributes {
          attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -28,7 +28,7 @@ index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..a44f86f4be8db0c65de630d1bb2b1d47
  dependencies {
      // api dependencies are listed transitively to API consumers
 -    api("com.google.guava:guava:32.1.2-jre")
-+    api("com.google.guava:guava:33.0.0-jre") // Leaf - Bump Dependencies
++    api("com.google.guava:guava:33.1.0-jre") // Leaf - Bump Dependencies
      api("com.google.code.gson:gson:2.10.1")
      // Paper start - adventure
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
@@ -46,13 +46,13 @@ index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..a44f86f4be8db0c65de630d1bb2b1d47
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
 -    api("io.sentry:sentry:5.4.0") // Pufferfish
-+    api("io.sentry:sentry:7.5.0") // Pufferfish // Leaf - Bump Dependencies
++    api("io.sentry:sentry:7.6.0") // Pufferfish // Leaf - Bump Dependencies
 
 -    implementation("org.ow2.asm:asm:9.5")
 -    implementation("org.ow2.asm:asm-commons:9.5")
 +    // Leaf start - Bump Dependencies
-+    implementation("org.ow2.asm:asm:9.6")
-+    implementation("org.ow2.asm:asm-commons:9.6")
++    implementation("org.ow2.asm:asm:9.7")
++    implementation("org.ow2.asm:asm-commons:9.7")
      // Paper end
 
      api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
@@ -74,7 +74,7 @@ index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..a44f86f4be8db0c65de630d1bb2b1d47
 -    testImplementation("org.mockito:mockito-core:5.5.0")
 -    testImplementation("org.ow2.asm:asm-tree:9.5")
 +    testImplementation("org.mockito:mockito-core:5.11.0")
-+    testImplementation("org.ow2.asm:asm-tree:9.6")
++    testImplementation("org.ow2.asm:asm-tree:9.7")
 +    // Leaf end
  }
 
@@ -84,7 +84,7 @@ index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..a44f86f4be8db0c65de630d1bb2b1d47
      options.isDocFilesSubDirs = true
      options.links(
 -        "https://guava.dev/releases/32.1.2-jre/api/docs/",
-+        "https://guava.dev/releases/33.0.0-jre/api/docs/", // Leaf - Bump Dependencies
++        "https://guava.dev/releases/33.1.0-jre/api/docs/", // Leaf - Bump Dependencies
          "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
          // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat

patches/generated-api/0001-Purpur-generated-api-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 642956fe6151a87488d861ccb98e4d46d355d599
+Commit: b7e80840c6a96e1132bb0eb01ef34233334461d4
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 069f2668f5229b0368b796e65eef1648fba0a097..9b991201a2f6cc9feccccf7f4e7bcded64117764 100644