Updated API patches to 1.21

.github/workflows/build-121.yml

@@ -1,10 +1,10 @@
-name: Build Leaf 1.20.6
+name: Build Leaf 1.21
 
 on:
   push:
-    branches: [ "ver/1.20.6" ]
+    branches: [ "ver/1.21" ]
   pull_request:
-    branches: [ "ver/1.20.6" ]
+    branches: [ "ver/1.21" ]
 
 jobs:
   build:
@@ -33,8 +33,8 @@ jobs:
 
       - name: Rename Paperclip Jar
         run: |
-          mv build/libs/leaf-paperclip-1.20.6-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.20.6-mojmap.jar
+          mv build/libs/leaf-paperclip-1.21-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21-mojmap.jar
-          mv build/libs/leaf-paperclip-1.20.6-R0.1-SNAPSHOT-reobf.jar ./leaf-1.20.6-reobf.jar
+          mv build/libs/leaf-paperclip-1.21-R0.1-SNAPSHOT-reobf.jar ./leaf-1.21-reobf.jar
 
 #      - name: Publish API
 #        if: github.event_name != 'pull_request'
@@ -48,15 +48,15 @@ jobs:
       - name: Upload Leaf
         uses: actions/upload-artifact@main
         with:
-          name: Leaf 1.20.6
+          name: Leaf 1.21
-          path: ./leaf-1.20.6-*.jar
+          path: ./leaf-1.1-*.jar
 
       - name: Release Leaf
         if: github.event_name != 'pull_request'
         uses: marvinpinto/action-automatic-releases@master
         with:
-          title: "Leaf 1.20.6"
+          title: "Leaf 1.21"
-          automatic_release_tag: "ver-1.20.6"
+          automatic_release_tag: "ver-1.21"
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          files: "./leaf-1.20.6-*.jar"
+          files: "./leaf-1.21-*.jar"
           prerelease: false

README.md

@@ -2,7 +2,7 @@
 <div align="center">
  
 [![Github Releases](https://img.shields.io/badge/Download-Releases-blue?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/releases)⠀
-[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1206.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀
+[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-121.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)⠀
 [![Discord](https://img.shields.io/discord/1145991395388162119?label=discord&style=for-the-badge&colorA=19201a&colorB=298046)](https://discord.gg/gfgAwdSEuM)
 
 **Leaf** is a drop-in replacement for [Paper](https://papermc.io/) servers designed to remove some checks, customized and high-performance, built on top of [Gale](https://github.com/GaleMC/Gale) with optimizations and fixes from other forks.
@@ -53,14 +53,14 @@ Building a Paperclip JAR for distribution:
 <dependency>
     <groupId>cn.dreeam.leaf</groupId>
     <artifactId>leaf-api</artifactId>
-    <version>1.20.6-R0.1-SNAPSHOT</version>
+    <version>1.21-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
 ### Gradle
 ```kotlin
 dependencies {
-    compileOnly("cn.dreeam.leaf:leaf-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("cn.dreeam.leaf:leaf-api:1.21-R0.1-SNAPSHOT")
 }
 ```
 

gradle.properties

@@ -1,8 +1,8 @@
 group = cn.dreeam.leaf
-mcVersion = 1.20.6
+mcVersion = 1.21
-version = 1.20.6-R0.1-SNAPSHOT
+version = 1.21-R0.1-SNAPSHOT
 
-galeCommit = 886651ccef21e12c941fb8c3304ed7c8a83178e3
+galeCommit = c38aecb7c8248b568554078b299fdaf3e968def3
 
 org.gradle.caching = true
 org.gradle.parallel = true

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 6d77d7989e757f18ba5d72b07e3b82016a5e28a2..52bd9bab6315a3b962f4cab215a979a802bec182 100644
+index 2732389405c054d34cf030ce46323ceaf899b61b..6d4ca47713fa10e39026f7ecede40ee6a2d4efad 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2310,6 +2310,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2304,6 +2304,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
          // Paper end
  

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

@@ -1,12 +1,12 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Github Actions <no-reply@github.com>
-Date: Mon, 29 Apr 2024 09:05:40 +0000
+Date: Mon, 17 Jun 2024 04:06:53 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a
+Commit: ea406a0e2b34442110fb963035ca5ea8f01b33be
 
 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
@@ -35,10 +35,10 @@ index 957f15a91f6aa1235c12b82079e32bb42449c78d..9fa8d7fac5bf415b40c3a9a38108fa54
      /**
       * The brand id for Leaf.
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d8cd53f7e45d3b5276aa360b10ff05ce7275a3a3..8c4619de2a52003a9684cc95f920b12e40944f27 100644
+index 1ea2a7f598c6a214a6562ce6ad2e49e83c7149ab..1a3808ed4bf57e1397a7e9c38ddf9f9f303022f6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2980,4 +2980,127 @@ public final class Bukkit {
+@@ -2974,4 +2974,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 762216a117145676d3df2b74036799b024461fb7..54c080d650f807b05e5d8347f78e2bc243791172 100644
+index 54704da43cf9c429f3914f0580246dde99aa93c0..e1a677cfde05aba487a09e34e170fea61a125e7d 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -5764,4 +5764,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5622,4 +5622,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 12dd25921625db145287edba783ae6d7e904ce80..9ed8f4e3e3d33e4bdefc7db85d5f65e39a971041 100644
+index 6d4ca47713fa10e39026f7ecede40ee6a2d4efad..27a060b772cc72b7952799b52f84f02a817e6574 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2310,6 +2310,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2304,6 +2304,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
  
          // Paper end
  
@@ -427,7 +427,7 @@ index 12dd25921625db145287edba783ae6d7e904ce80..9ed8f4e3e3d33e4bdefc7db85d5f65e3
          // Leaf start
          @NotNull
          public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
-@@ -2633,4 +2645,104 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2627,4 +2639,104 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      long getLastTickOversleepTime();
      // Gale end - YAPFA - last tick time - API
  
@@ -533,10 +533,10 @@ index 12dd25921625db145287edba783ae6d7e904ce80..9ed8f4e3e3d33e4bdefc7db85d5f65e3
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fdb87adfb8d6eff2bfabe7a41398c53d15d4cd98..0f2f7cb8acb226d6f9a1085ec9cac3f8faa77813 100644
+index d8a23aa0d898ca3360757721e38ddb97387f7d21..ca600d3e8b1f4fae299b1bf3d283c466c18875a6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4276,6 +4276,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4145,6 +4145,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
@@ -905,22 +905,15 @@ 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 5c29956c6db53440322330ff723c7087193641f1..544b1d8aa5665fd2567605014adee6222d2cb312 100644
+index 5c29956c6db53440322330ff723c7087193641f1..05123a4833b8908d8ceee3e72d42f2289e33999a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1447,4 +1447,27 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1447,4 +1447,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
      // Paper end - body yaw API
 +
-+    // Purpur start
++    // Purpur start - API for any mob to burn daylight
-+    /**
-+     * Play item break animation for the item in specified equipment slot
-+     *
-+     * @param slot Equipment slot to play break animation for
-+     */
-+    void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);
-+
 +    /**
 +     * If this mob will burn in the sunlight
 +     *
@@ -934,7 +927,7 @@ index 5c29956c6db53440322330ff723c7087193641f1..544b1d8aa5665fd2567605014adee622
 +     * @param shouldBurnInDay True to burn in sunlight
 +     */
 +    void setShouldBurnInDay(boolean shouldBurnInDay);
-+    // Purpur end
++    // Purpur end - API for any mob to burn daylight
  }
 diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
 index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc04d6a829 100644
@@ -962,10 +955,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 6324b7980dc0e4fc2194cbf55a2bb56f142d318c..6a11a44099ceced971e2909b564d40ed687f62e2 100644
+index 328c34dee07311193d41f36c0976ed09135ab448..66da298cb8ed2e53be10c23faf59b61b056e6530 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3864,4 +3864,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3869,4 +3869,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
@@ -1184,7 +1177,7 @@ index 4b84c04675775e2a606630b00de8afe51665cebc..ccbaf40a3131f477b4be2264401ad893
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
-index 446b3ffd5caca5344be1c250475679834cd0d4a2..3da8d3d8925cd7a111c0c357bceecfd3a801c8eb 100644
+index ca634147935c3bda8abad5dc73327e51381793a8..02c6a087dc41ffb004bcc20284135844188f8142 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
 @@ -303,7 +303,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
@@ -1215,10 +1208,10 @@ index c9f395064656dd0126410eb3c6e197baa450c063..13156a12e5df50cdc1e465dc0bd9d941
           * When a player gets bad omen after killing a patrol captain.
           */
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 59b375569a75cb1e1f7c610f96078e102ec0d3ed..a3f74891abbdc51dbbddaeb511f2754e0603c904 100644
+index 851e40dc8af6dcb5670785e006b078af7e72fb76..e814e4f9cf12cd7c783981278f110ccf144263b2 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -166,7 +166,7 @@ public enum InventoryType {
+@@ -163,7 +163,7 @@ public enum InventoryType {
      SMITHING_NEW(4, "Upgrade Gear"),
      ;
  
@@ -1247,7 +1240,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 40cde68c7b73a0a92e2a96667a90138d67ce66ff..fee2469bdedff0e55ef4dcda410cac35c6319258 100644
+index 7f5633e7689b82b937d5b985c3e6ae15dc94a20f..e77842896654088cedc19822a99361778336057a 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -19,6 +19,17 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -1268,7 +1261,7 @@ index 40cde68c7b73a0a92e2a96667a90138d67ce66ff..fee2469bdedff0e55ef4dcda410cac35
  
  /**
   * Represents a stack of items.
-@@ -1081,4 +1092,565 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1089,4 +1100,565 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
      }
      // Paper end - expose itemstack tooltip lines

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

@@ -7,10 +7,10 @@ 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 6a11a44099ceced971e2909b564d40ed687f62e2..bd00c8f6d9a90ab42e541a52d16d6233c37ce79b 100644
+index 66da298cb8ed2e53be10c23faf59b61b056e6530..ed13846486a649afa801e4063d2a6128081691d9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3983,4 +3983,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3988,4 +3988,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 bd00c8f6d9a90ab42e541a52d16d6233c37ce79b..54d4bff74eb1e83ad7540d2089033444a7c07cd0 100644
+index ed13846486a649afa801e4063d2a6128081691d9..62af8f4bafa7b02cc71c1b0c24656284165fc36d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3686,6 +3686,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3691,6 +3691,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  

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: f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a
+Commit: ea406a0e2b34442110fb963035ca5ea8f01b33be
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 43f4deacef349502cbb207aafc4f9cb7a75177c5..6b692c24a62e2172116a6b9c371b1c0e2411c27e 100644