Merge branch 'ver/1.21.1' into fix/rv

.github/workflows/build-1211.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - uses: gradle/wrapper-validation-action@main
+      - uses: gradle/actions/wrapper-validation@main
       - name: Set up JDK
         uses: graalvm/setup-graalvm@main
         with:

README.md

@@ -30,7 +30,7 @@
 
 ## 📫 Contact
 - Discord: [`https://discord.com/invite/gfgAwdSEuM`](https://discord.com/invite/gfgAwdSEuM)
-- QQ Group: `715128273`
+- QQ Group: `619278377`
 
 ## 📫 Donation
 If you love my work, feel free to donate :)
@@ -100,7 +100,6 @@ If these excellent projects hadn't appeared, Leaf wouldn't have become great.
     <p>
       • <a href="https://github.com/KeYiMC/KeYi">KeYi</a> (R.I.P.)
         <a href="https://github.com/MikuMC/KeYiBackup">(Backup)</a><br>
-      • <a href="https://github.com/lynxplay/ktp">KTP</a><br>
       • <a href="https://github.com/etil2jz/Mirai">Mirai</a><br>
       • <a href="https://github.com/Bloom-host/Petal">Petal</a><br>
       • <a href="https://github.com/fxmorin/carpet-fixes">Carpet Fixes</a><br>
@@ -115,6 +114,7 @@ If these excellent projects hadn't appeared, Leaf wouldn't have become great.
       • <a href="https://github.com/HaHaWTH/Polpot">Polpot</a><br>
       • <a href="https://github.com/plasmoapp/matter">Matter</a><br>
       • <a href="https://github.com/LuminolMC/Luminol">Luminol</a><br>
+      • <a href="https://github.com/Gensokyo-Reimagined/Nitori">Nitori</a><br>
     </p>
 </details>
 

gradle.properties

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

patches/api/0001-Rebrand.patch

@@ -5,15 +5,19 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index bdc8d830f54e4567ec0b03041221fdcd016ce76c..957f15a91f6aa1235c12b82079e32bb42449c78d 100644
+index bdc8d830f54e4567ec0b03041221fdcd016ce76c..25ad7e9a9aa11049ad6ce2d2c829d3e75f8886c2 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -25,6 +25,13 @@ public interface ServerBuildInfo {
+@@ -25,6 +25,17 @@ public interface ServerBuildInfo {
      Key BRAND_GALE_ID = Key.key("galemc", "gale");
      // Gale end - branding changes
 
 +    // Leaf start
 +    /**
++     * The brand id for Pufferfish.
++     */
++    Key BRAND_PUFFERFISH_ID = Key.key("pufferfish-gg", "pufferfish");
++    /**
 +     * The brand id for Leaf.
 +     */
 +    Key BRAND_LEAF_ID = Key.key("winds-studio", "leaf");

patches/api/0002-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 5b47d9cf775e06bfb1c897905b19346cb10f4de0..e72a7adee66a2843c49fc4b293b91ec5dba0bc65 100644
+index b2c31cfa7013b2e98225444fa7c0a9c2efd97bb6..2a22f20f25f46766cd8bc69a640898f4b051fc68 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2307,6 +2307,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2318,6 +2318,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
 
          // Paper end
 

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: abf2f2109bd550623a8b3e9d398995aa0185e70c
+Commit: 0a9941ee397c7d49fd9a2a1f4aaa78bb0907bd01
 
 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
@@ -17,7 +17,7 @@ Remove-Timings.patch
 Add-log-suppression-for-LibraryLoader.patch
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 957f15a91f6aa1235c12b82079e32bb42449c78d..9fa8d7fac5bf415b40c3a9a38108fa5476ed7619 100644
+index 25ad7e9a9aa11049ad6ce2d2c829d3e75f8886c2..0cafbbcb8fe294bcd84b93da8fba96368971dffd 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
 @@ -25,6 +25,13 @@ public interface ServerBuildInfo {
@@ -33,12 +33,12 @@ index 957f15a91f6aa1235c12b82079e32bb42449c78d..9fa8d7fac5bf415b40c3a9a38108fa54
 +
      // Leaf start
      /**
-      * The brand id for Leaf.
+      * The brand id for Pufferfish.
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cd191a6039717c70d2b8be0ae475d040cad54f96..c7e2dd4465334ab845e931ed14fbfde43b6d4ea4 100644
+index 3576093460cba9b3ef2cc46b3d4d03eedba5a0f9..ebf04da015cfe394e9c5d3a3c432674df979f93c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2977,4 +2977,127 @@ public final class Bukkit {
+@@ -2988,4 +2988,127 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -249,10 +249,10 @@ index 918a045165cdcde264bc24082b7afebb407271de..e98d6321c5f2cdde91b54f8a74cbcc04
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 54704da43cf9c429f3914f0580246dde99aa93c0..e1a677cfde05aba487a09e34e170fea61a125e7d 100644
+index 40820f27f1dd7d368ac710a45f6fe8d4269c004f..724e64a8ff978456c101a97432e45f234e349926 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -5622,4 +5622,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5623,4 +5623,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
          }
          return Registry.BLOCK.get(material.key);
      }
@@ -405,10 +405,10 @@ index 3993fecec5b4c2bbd77e175a168afcad571ce4d1..d0206c9c2f423a9b77237d9a005b9ee1
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e72a7adee66a2843c49fc4b293b91ec5dba0bc65..c9049ac104a3b8c294223089425bd294a3928915 100644
+index b1c34f4d44b420930e79dd440328e522b669601f..ab6e3eb18b9c36fdd8f56f491332085aa2ec0c37 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2307,6 +2307,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2318,6 +2318,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
 
          // Paper end
 
@@ -427,7 +427,7 @@ index e72a7adee66a2843c49fc4b293b91ec5dba0bc65..c9049ac104a3b8c294223089425bd294
          // Leaf start
          @NotNull
          public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
-@@ -2630,4 +2642,104 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2641,4 +2653,104 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      long getLastTickOversleepTime();
      // Gale end - YAPFA - last tick time - API
 
@@ -905,7 +905,7 @@ 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 a1e54e9d14393a6c0ea57cca854071c5396d9717..e492d3707e948cd3936f0f9c5eea4668fb1fe249 100644
+index fcdc5fce88720cc926a3953d80b5045113d1516c..5afdebfdf74d4c428a58045db2190dded7f68307 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1458,4 +1458,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1108,7 +1108,7 @@ 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 444744ea6f5921b0ae229995f8b15ea9d980c402..508bb3493e74a42ce8abf57bba05c08a715849dc 100644
+index db5c7434a7e529727b556f314d5cd8e0534114fe..ec8a9225a45dd95b07b1d5d2f4eaf889178fc112 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 {
@@ -1842,7 +1842,7 @@ index b3abe3bde05d4a360e31e490bff8a859dc2bd4a6..9b8b958ce181b60eb5db89d472038015
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index e7796054f3f65f5bea7f93c75320195f6c2f0561..1b1d05b77e93abe93ed782883f8d791f6559f778 100644
+index f1aa67997f904953742e8895e49341c2f73d44a2..993cf7995514fb0ef3c4388bb3ce49c3187ab251 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
 @@ -191,6 +191,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
@@ -3424,10 +3424,10 @@ index 0000000000000000000000000000000000000000..fd6a5a3589d436c2aaf988fd30589969
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java b/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..eebb5d124456b8209d1b8e8cc4cb772dd3714f04
+index 0000000000000000000000000000000000000000..d4ccbce1dc8817dcc97c7cdce65d099b6c16b0c8
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,74 @@
 +package org.purpurmc.purpur.event.inventory;
 +
 +import org.bukkit.entity.HumanEntity;
@@ -3473,6 +3473,7 @@ index 0000000000000000000000000000000000000000..eebb5d124456b8209d1b8e8cc4cb772d
 +
 +    /**
 +     * Get the amount of experience this transaction will give
++     * (takes priority over and uses result from {@link org.bukkit.event.block.BlockExpEvent})
 +     *
 +     * @return Amount of experience to give
 +     */
@@ -3482,6 +3483,7 @@ index 0000000000000000000000000000000000000000..eebb5d124456b8209d1b8e8cc4cb772d
 +
 +    /**
 +     * Set the amount of experience this transaction will give
++     * (takes priority over {@link org.bukkit.event.block.BlockExpEvent})
 +     *
 +     * @param experienceAmount Amount of experience to give
 +     */

patches/api/0006-Bump-Dependencies.patch

@@ -3,10 +3,9 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
 Date: Fri, 28 Oct 2022 17:24:16 -0400
 Subject: [PATCH] Bump Dependencies
 
-TODO - Dreeam: Bump & test dependencies, impl new features?
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab30707fd8b49 100644
+index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..88e1e3a4e266c1b7bd709316b04f18fd589a64b2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,8 +12,10 @@ java {
@@ -16,7 +15,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307
 -val slf4jVersion = "2.0.9"
 -val log4jVersion = "2.17.1"
 +// Leaf start - Bump Dependencies
-+val slf4jVersion = "2.0.13"
++val slf4jVersion = "2.0.16"
 +val log4jVersion = "2.23.1"
 +// Leaf end - Bump Dependencies
  val apiAndDocs: Configuration by configurations.creating {
@@ -28,7 +27,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307
      // api dependencies are listed transitively to API consumers
 -    api("com.google.guava:guava:32.1.2-jre")
 -    api("com.google.code.gson:gson:2.10.1")
-+    api("com.google.guava:guava:33.2.1-jre") // Leaf - Bump Dependencies
++    api("com.google.guava:guava:33.3.0-jre") // Leaf - Bump Dependencies
 +    api("com.google.code.gson:gson:2.11.0") // Leaf - Bump Dependencies
      // Paper start - adventure
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
@@ -37,13 +36,13 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307
      // Paper - adventure
      api("org.yaml:snakeyaml:2.2")
 -    api("org.joml:joml:1.10.5")
-+    api("org.joml:joml:1.10.5") // Leaf - Bump Dependencies // Dreeam TODO - Waiting update to 1.10.7
++    api("org.joml:joml:1.10.5") // Leaf - Bump Dependencies // Dreeam TODO - Waiting update to 1.10.8, Dont bump
      // Paper start
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
      }
 -    api("it.unimi.dsi:fastutil:8.5.6")
-+    api("it.unimi.dsi:fastutil:8.5.13") // Leaf - Bump Dependencies
++    api("it.unimi.dsi:fastutil:8.5.14") // Leaf - Bump Dependencies
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
@@ -52,7 +51,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307
      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.12.0") // Pufferfish // Leaf - Bump Dependencies // Dreeam TODO - Update to 8.0.0
++    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")
@@ -62,9 +61,9 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307
 -    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
 -    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 +    // Leaf start - Bump Dependencies
-+    api("org.apache.maven:maven-resolver-provider:3.9.8") // Paper - make API dependency for Paper Plugins
-+    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.21") // Dreeam TODO - Update to 2.0.0
-+    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.21")
++    api("org.apache.maven:maven-resolver-provider:3.9.9") // Paper - make API dependency for Paper Plugins
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // Dreeam TODO - Update to 2.0.1
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // Dreeam TODO - Update to 2.0.1
 +    // Leaf end - Bump Dependencies
 
      val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
@@ -73,26 +72,27 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307
 
      // Paper start - add checker
 -    val checkerQual = "org.checkerframework:checker-qual:3.33.0"
-+    val checkerQual = "org.checkerframework:checker-qual:3.45.0" // Leaf - Bump Dependencies
++    val checkerQual = "org.checkerframework:checker-qual:3.46.0" // Leaf - Bump Dependencies
      compileOnlyApi(checkerQual)
      testCompileOnly(checkerQual)
      // Paper end
 
 -    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.15.0")
-+    testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2")
++    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")
 +    // Leaf end - Bump Dependencies
-     testImplementation("org.hamcrest:hamcrest:2.2")
--    testImplementation("org.mockito:mockito-core:5.11.0")
-+    testImplementation("org.mockito:mockito-core:5.12.0") // Leaf - Bump Dependencies
      testImplementation("org.ow2.asm:asm-tree:9.7")
 +
 +    // Leaf - Bump Dependencies
 +    // commons-lang3 is removed in maven-resolver-provider since 3.9.8
 +    // Add this because bukkit api still need it.
-+    implementation("org.apache.commons:commons-lang3:3.15.0")
++    compileOnly("org.apache.commons:commons-lang3:3.16.0")
  }
 
  // Paper start

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

@@ -7,7 +7,7 @@ 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 ed13846486a649afa801e4063d2a6128081691d9..62af8f4bafa7b02cc71c1b0c24656284165fc36d 100644
+index d5df69a2e5b228545dfaaaa98ce88ec0da806315..a6d43ac0ee1b4bac6efc3283c7eea643a45e2d93 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3691,6 +3691,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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: abf2f2109bd550623a8b3e9d398995aa0185e70c
+Commit: 0a9941ee397c7d49fd9a2a1f4aaa78bb0907bd01
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 02411466bdcf4ff731f01ccebb2c99942e0db878..2718c0e5061838b01881bb231c53f4da348adce3 100644

patches/api/0007-KTP-Allow-unknown-event-thread-execution.patch → patches/removed/api/0007-KTP-Allow-unknown-event-thread-execution.patch

@@ -3,6 +3,8 @@ From: Bjarne Koll <lynxplay101@gmail.com>
 Date: Thu, 9 Dec 2021 01:53:30 +0100
 Subject: [PATCH] KTP: Allow unknown event thread execution
 
+Removed since 1.21.1
+
 Original license: GPL v3
 Original project: https://github.com/lynxplay/ktp
 

patches/server/0020-KTP-Allow-unknown-event-thread-execution.patch → patches/removed/server/0020-KTP-Allow-unknown-event-thread-execution.patch

@@ -3,6 +3,8 @@ From: Bjarne Koll <lynxplay101@gmail.com>
 Date: Sun, 19 Feb 2023 16:14:28 +0100
 Subject: [PATCH] KTP: Allow unknown event thread execution
 
+Removed since 1.21.1
+
 Original license: GPL v3
 Original project: https://github.com/lynxplay/ktp
 

patches/unapplied/server/0039-NachoSpigot-Async-Explosion.patch → patches/removed/server/0039-NachoSpigot-Async-Explosion.patch

@@ -3,6 +3,8 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
 Date: Sun, 3 Sep 2023 05:14:45 -0400
 Subject: [PATCH] NachoSpigot: Async Explosion
 
+Removed since useless
+
 Original code by CobbleSword, licensed under GPL v3
 You can find the original code on https://github.com/CobbleSword/NachoSpigot