Updated Upstream (Gale/Purpur/Dependencies)

README.md

@@ -36,7 +36,7 @@
 ## 📥 Download
 You can find latest successful build in [GitHub Action](https://github.com/Winds-Studio/Leaf/actions) or [Releases](https://github.com/Winds-Studio/Leaf/releases)
 
-**Please note Java >= 17 is required, Java >= 21 is recommended.**
+**Please note Java >= 17 is required, Java 21 is recommended.**
 
 ## 📦 Building
 Building a Paperclip JAR for distribution:

build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false // paperweight required this original shadow
     id("io.github.goooler.shadow") version "8.1.7" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.14-SNAPSHOT"
+    id("io.papermc.paperweight.patcher") version "1.5.16-SNAPSHOT"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -17,7 +17,7 @@ repositories {
 
 dependencies {
     remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
-    decompiler("org.vineflower:vineflower:1.10.0")
+    decompiler("org.vineflower:vineflower:1.10.1")
     paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
 }
 

gradle.properties

@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.20.4-R0.1-SNAPSHOT
 
-galeCommit = 634079471c530a62f3280dfeddc00f8f1d25532e
+galeCommit = 53ce7ab06d7eccb91990b163db28c60736153bc7
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Leaf-config-files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaf config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bb73389fd8ffcc2fb89ece44e7704f87baa3058e..55830a5621b5f1b59dc7285425e1fd949a4aea83 100644
+index e0615e17765406bab75b5d16f9056d6821c577ee..80499cd30914ca97576532bd86967cbfaabe2577 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2282,6 +2282,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2288,6 +2288,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
 
          // Paper end
 

patches/api/0002-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 f2cbc7a803177a901135cf020239031979292c6c..1bbc94b97662aa0367c9b5bac19bec313f158c14 100644
+index 810100ac785d49bd332455de23690d37e5fbbb81..4a9deabf03236533aa86860326f0da21650dd38f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -51,6 +51,7 @@ dependencies {
@@ -16,8 +16,8 @@ index f2cbc7a803177a901135cf020239031979292c6c..1bbc94b97662aa0367c9b5bac19bec31
      api("org.slf4j:slf4j-api:$slf4jVersion")
 +    api("io.sentry:sentry:5.4.0") // Pufferfish
 
-     implementation("org.ow2.asm:asm:9.5")
-     implementation("org.ow2.asm:asm-commons:9.5")
+     implementation("org.ow2.asm:asm:9.7")
+     implementation("org.ow2.asm:asm-commons:9.7")
 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..364e20dfb1a141e86ae64663cc5f31ac6be3306f

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

@@ -34,10 +34,10 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
 
          @Override
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 12412ffbfa05f91d46509a90fe3af7085349eb63..69e1800274218115877870b43d44cecd77f27c83 100644
+index d8201747ede92a0123eec012844a7a674e6947f5..e0ecc43fc6a952b4897c530af2e89f2c0558740e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2945,4 +2945,127 @@ public final class Bukkit {
+@@ -2951,4 +2951,127 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -256,10 +256,10 @@ index 918a045165cdcde264bc24082b7afebb407271de..687d11619379aead7f665d4a5f8f8bcc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index f9af60356da4668cec8b24e73f5747ab82e35a91..b304ad1307cdd6785653b1eab9781e070fb14c5a 100644
+index ec117c47401ea1a04beb0e5ee9d4d394db7c5c4e..5b058d709751a5b720e209931774e09fcc9c960c 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -11557,4 +11557,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -11559,4 +11559,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public boolean isEnabledByFeature(@NotNull World world) {
          return Bukkit.getDataPackManager().isEnabledByFeature(this, world);
      }
@@ -412,10 +412,10 @@ index 30298a629b39bd43ce14b414fc697b2dfcbea89c..ce00af9121de7a910aaea4e0685a06d4
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 55830a5621b5f1b59dc7285425e1fd949a4aea83..bba0c8d28b0d02bd85d279b74a83aa8bf66c37d4 100644
+index 80499cd30914ca97576532bd86967cbfaabe2577..98311ea5696f722b431444a569f0f172a9d32973 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2282,6 +2282,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2288,6 +2288,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
 
          // Paper end
 
@@ -434,7 +434,7 @@ index 55830a5621b5f1b59dc7285425e1fd949a4aea83..bba0c8d28b0d02bd85d279b74a83aa8b
          // Leaf start
          @NotNull
          public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
-@@ -2599,4 +2611,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2605,4 +2617,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      long getLastTickOversleepTime();
      // Gale end - YAPFA - last tick time - API
 
@@ -547,10 +547,10 @@ index 55830a5621b5f1b59dc7285425e1fd949a4aea83..bba0c8d28b0d02bd85d279b74a83aa8b
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c5fe36050eeaff80cfb989fe2f38370215af6fe5..565ce4b0c5eb300953aaefa786b9f8938c771f2a 100644
+index 35fb5047dd8a8521586a9ca9f8d70881355fb7f5..c2fc3c7158b65a875515afda0d69e2d6529db976 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4213,6 +4213,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4222,6 +4222,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
 
@@ -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 967125e99adc1b5446f42811d60ef44ba56ef5f5..644f58eeef73bab67ab50b16b87e7c2e798ea2c0 100644
+index 23def071492ccd715693d534cc506936e18f0f46..51ae4b559a6ebb5c324ac029c86e5b5a6b894d7e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1138,4 +1138,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1144,4 +1144,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull String getScoreboardEntryName();
      // Paper end - entity scoreboard name
@@ -925,13 +925,13 @@ 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 5cb82901a5d0c8ee673501fc53389d526d4a5b6f..91ce069e4f23a115a01b329dcf053ed19dfb83bc 100644
+index 65112eae8b92344796850b1e4c89e75443eab2fe..5369d802d37863a1efc0c031520147ceedcadc78 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1312,4 +1312,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1445,4 +1445,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
-     // Paper end
+     // Paper end - body yaw API
 +
 +    // Purpur start
 +    /**
@@ -1301,7 +1301,7 @@ index f680545b6b59bf8d2ad154b0472dda4cba42a162..3709ff939acdcaec124c2875a37c4a07
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 245a730a54c4b241a9a67eccceefafd2763bd238..516b3bcca3974ad4f4ae74747db0d7d094714e55 100644
+index 7414b4fa690d393a8e9557cc1fd1ce12fa426940..e0f8cab6d78110a43c29d3b5256539d62ba03abf 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;
@@ -1323,7 +1323,7 @@ index 245a730a54c4b241a9a67eccceefafd2763bd238..516b3bcca3974ad4f4ae74747db0d7d0
 
  /**
   * Represents a stack of items.
-@@ -1033,4 +1045,636 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1061,4 +1073,636 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
      }
      // Paper end - expose itemstack tooltip lines

patches/api/0004-Remove-Timings.patch

@@ -2830,7 +2830,7 @@ index 3e61a926620a67daec3af54b72a1b911eaef2ed4..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 9a65c4f614a6c358d74491794d7b25172a00bc11..c4216af83db0529650f190a97f55a55b523161a7 100644
+index b9a07b2db8a3dcdb72c33c8ceda129921b2c02f1..d2e8e1f000277343801261d2dde4d1e5b91035ea 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -40,7 +40,6 @@ public interface UnsafeValues {
@@ -2841,7 +2841,7 @@ index 9a65c4f614a6c358d74491794d7b25172a00bc11..c4216af83db0529650f190a97f55a55b
      Material toLegacy(Material material);
 
      Material fromLegacy(Material material);
-@@ -139,11 +138,6 @@ public interface UnsafeValues {
+@@ -141,11 +140,6 @@ public interface UnsafeValues {
      // Paper end
 
      // Paper start

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..ff15203aa5f18ced362d1d6e5d10ed5fa3b90b40 100644
+index 4a9deabf03236533aa86860326f0da21650dd38f..5cd6853b555778fd198280790968fee390c85a8f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,11 +9,11 @@ java {
@@ -18,7 +18,7 @@ index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..ff15203aa5f18ced362d1d6e5d10ed5f
  val adventureVersion = "4.16.0"
 -val slf4jVersion = "2.0.9"
 -val log4jVersion = "2.17.1"
-+val slf4jVersion = "2.0.12" // Leaf - Bump Dependencies
++val slf4jVersion = "2.0.13" // Leaf - Bump Dependencies
 +val log4jVersion = "2.23.1" // Leaf - Bump Dependencies
  val apiAndDocs: Configuration by configurations.creating {
      attributes {
@@ -41,22 +41,16 @@ index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..ff15203aa5f18ced362d1d6e5d10ed5f
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
-@@ -51,10 +51,11 @@ dependencies {
+@@ -51,7 +51,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:5.4.0") // Pufferfish
-+    api("io.sentry:sentry:7.6.0") // Pufferfish // Leaf - Bump Dependencies
++    api("io.sentry:sentry:7.8.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.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
-@@ -66,16 +67,17 @@ dependencies {
+     implementation("org.ow2.asm:asm:9.7")
+     implementation("org.ow2.asm:asm-commons:9.7")
+@@ -66,13 +66,15 @@ dependencies {
      testCompileOnly(annotations)
 
      // Paper start - add checker
@@ -68,17 +62,13 @@ index 2ea90f77c8ad7a36c51df0dfe1d333b10a765255..ff15203aa5f18ced362d1d6e5d10ed5f
 
 -    testImplementation("org.apache.commons:commons-lang3:3.12.0")
 -    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
++    // Leaf start - Bump Dependencies
 +    testImplementation("org.apache.commons:commons-lang3:3.14.0")
 +    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
-     testImplementation("org.hamcrest:hamcrest:2.2")
--    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.7")
 +    // Leaf end
- }
-
- // Paper start
+     testImplementation("org.hamcrest:hamcrest:2.2")
+     testImplementation("org.mockito:mockito-core:5.11.0")
+     testImplementation("org.ow2.asm:asm-tree:9.7")
 @@ -143,12 +145,12 @@ tasks.withType<Javadoc> {
      options.use()
      options.isDocFilesSubDirs = true

patches/server/0006-Pufferfish-Optimize-mob-spawning.patch

@@ -20,7 +20,7 @@ and, in my opinion, worth the low risk of minor mob-spawning-related
 inconsistencies.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 43d362ec5444941b7d897bc3205375ac44c44924..3cfc1e3d332efd3abd5b55b59fb7bcf64b45dfcd 100644
+index 46a223d184bdc91058b90692df4002ed1da4516c..90eb43f08fe781aafe2f8ac7921bdf148178761b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -297,6 +297,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -158,10 +158,10 @@ index 68ad7cb06d85c428f3560f95ed46bca32187e729..6587ce30d88983cb42822e6ff3e01204
 
      // Gale start - MultiPaper - skip unnecessary mob spawning computations
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-index 4cdfc433df67afcd455422e9baf56f167dd712ae..57fcf3910f45ce371ac2e237b277b1034caaac4e 100644
+index 83a39f900551e39d5af6f17a339a386ddee4feef..0c8c534fc69172387f188af5282accfed7597ac7 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
 +++ b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
+@@ -9,7 +9,7 @@ import javax.annotation.Nullable;
  import net.minecraft.world.entity.Entity;
 
  public class EntityTickList {