Updated Upstream (Gale & Purpur & Dependencies)

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.5"
+    id("io.papermc.paperweight.patcher") version "1.5.7-SNAPSHOT"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

gradle.properties

@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.20.1-R0.1-SNAPSHOT
 
-galeCommit = 91ba1633a96c8807aeb6c2371e0be5b464fcdaa8
+galeCommit = 973966c1e838c5ece2d0197db2216675b5cfad22
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0002-Pufferfish-Sentry.patch

@@ -7,14 +7,14 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2020f6a2487fe93e98ea0e7faa0995b56a43b174..63c267dca9a97b877fe9bab526f1461b8346b82d 100644
+index a2f7dbcd9ab971e5c4b809e7c9dd39e9b1077af6..2f8d0f4a592536ab8d3b5a95093d118137ba65de 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -46,6 +46,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
-+    api("io.sentry:sentry:6.28.0") // Pufferfish
++    api("io.sentry:sentry:6.29.0") // Pufferfish
 
      implementation("org.ow2.asm:asm:9.4")
      implementation("org.ow2.asm:asm-commons:9.4")

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

@@ -3,7 +3,7 @@ From: Github Actions <no-reply@github.com>
 Date: Fri, 16 Jun 2023 05:21:52 +0000
 Subject: [PATCH] Purpur API Changes
 
-Commit: fbedef8a1618a8d61d787b50a8acc752e3e2ca4c
+Commit: f6fd5f6ba6e672bfdbc79def7e8598d984ec8b3c
 
 Patches below are removed in this patch:
 Build-System-Changes.patch
@@ -574,10 +574,10 @@ index a5938b0a960121bd77a13e4c8fc8a053bea481c5..43a57c9e32e5a51140e784a4a5a44c0b
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6917931966377c51db88a3364997a110dd987970..bf39c6602cfca70a6352519fa26059cd79143cdd 100644
+index b8b97df069b28fa3cf32f1ad1f01f586a0cfbc78..63bf1d70cce9176f47a158a4a767b1bf38d60dbd 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3992,6 +3992,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4008,6 +4008,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
 
@@ -1036,10 +1036,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 60df0fd1d3ef021cb6aecd8075a1ae87eac5d9eb..d1025b65d159ad3bf99157570b8b81fdb759ac34 100644
+index 2672072ccddaacfebeaea45de472c7420345cde7..877ed7bea937e0be1c404d5ab5cef8fce5e6ac17 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3283,4 +3283,143 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3285,4 +3285,143 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
@@ -1327,7 +1327,7 @@ index c60be4fd24c7fdf65251dd6169e5e1ac3b588d95..569deccd2f1cf21da9b5906433ac493c
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index d15a74c38576c49df61cfab02c70fc5d8c0dd5f7..64055402076b62d32ba947830d935b79bae12d95 100644
+index 0af73cc04edb93b9772136d4d808f657ea40e733..c733206b769d7a55076d863757fcac1a129033b7 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -1349,8 +1349,8 @@ index d15a74c38576c49df61cfab02c70fc5d8c0dd5f7..64055402076b62d32ba947830d935b79
 
  /**
   * Represents a stack of items.
-@@ -986,4 +998,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-         return livingEntity.damageItemStack(this, amount);
+@@ -1005,4 +1017,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+         return type.isAir() || amount <= 0;
      }
      // Paper end
 +

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 63c267dca9a97b877fe9bab526f1461b8346b82d..302cd023be8e961589110035a5303758bc8aa82d 100644
+index 2f8d0f4a592536ab8d3b5a95093d118137ba65de..d005dd963289cecad7fa072d2531165bd2fc9ef3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,8 +11,8 @@ java {
@@ -40,9 +40,9 @@ index 63c267dca9a97b877fe9bab526f1461b8346b82d..302cd023be8e961589110035a5303758
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
-@@ -48,30 +48,33 @@ dependencies {
+@@ -48,30 +48,32 @@ dependencies {
      api("org.slf4j:slf4j-api:$slf4jVersion")
-     api("io.sentry:sentry:6.28.0") // Pufferfish
+     api("io.sentry:sentry:6.29.0") // Pufferfish
 
 -    implementation("org.ow2.asm:asm:9.4")
 -    implementation("org.ow2.asm:asm-commons:9.4")
@@ -70,22 +70,20 @@ index 63c267dca9a97b877fe9bab526f1461b8346b82d..302cd023be8e961589110035a5303758
      compileOnlyApi(checkerQual)
      testCompileOnly(checkerQual)
      // Paper end
--    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito
-+    testImplementation("org.mockito:mockito-core:5.5.0") // Paper - add mockito // Leaf - Bump Dependencies
 
 -    testImplementation("org.apache.commons:commons-lang3:3.12.0")
 -    testImplementation("junit:junit:4.13.2")
 -    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +    testImplementation("org.apache.commons:commons-lang3:3.13.0")
 +    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-+
 +    testImplementation("org.hamcrest:hamcrest:2.2")
+     testImplementation("org.mockito:mockito-core:5.5.0")
      testImplementation("org.ow2.asm:asm-tree:9.5")
 +    // Leaf end
  }
 
  configure<PublishingExtension> {
-@@ -123,8 +126,8 @@ tasks.withType<Javadoc> {
+@@ -123,8 +125,8 @@ tasks.withType<Javadoc> {
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
@@ -94,9 +92,18 @@ index 63c267dca9a97b877fe9bab526f1461b8346b82d..302cd023be8e961589110035a5303758
 +        "https://guava.dev/releases/32.1.2-jre/api/docs/", // Leaf - Bump Dependencies
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", // Leaf - Bump Dependencies
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
-         // Paper start
-         // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // don't link to bungee chat
-@@ -169,6 +172,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
+         // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
+         // Paper start - add missing javadoc links
+@@ -141,7 +143,7 @@ tasks.withType<Javadoc> {
+         "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
+         "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
+         // Paper end
+-        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
++        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.15", // Paper // Leaf - Bump Dependencies
+     )
+     options.tags("apiNote:a:API Note:")
+
+@@ -174,6 +176,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
      jarToScan.set(tasks.jar.flatMap { it.archiveFile })
      classpath.from(configurations.compileClasspath)
  }

patches/api/0008-KeYi-Player-Skull-API.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d1025b65d159ad3bf99157570b8b81fdb759ac34..37668e737e7b507757c70e432a19647db6628b81 100644
+index 877ed7bea937e0be1c404d5ab5cef8fce5e6ac17..1be72e3f0dfb3a8f09af4d913cbe0dc87f30d232 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -8,8 +8,11 @@ import java.util.Collection;
@@ -23,7 +23,7 @@ index d1025b65d159ad3bf99157570b8b81fdb759ac34..37668e737e7b507757c70e432a19647d
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -3422,4 +3425,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3424,4 +3427,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          sendDeathScreen(message);
      }
      // Purpur end

patches/api/0009-Slice-Smooth-Teleports.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 37668e737e7b507757c70e432a19647db6628b81..8c596943784070915675fd3dc6dcb22c5b2d1a09 100644
+index 1be72e3f0dfb3a8f09af4d913cbe0dc87f30d232..abcb9f86459395ba3ec7ac186079451951f6b52e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3168,6 +3168,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3170,6 +3170,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end