#20240211.0

gradle.properties

@@ -3,7 +3,7 @@ version = 1.20.4-R0.1-SNAPSHOT
 
 mcVersion = 1.20.4
 
-paperCommit = 9e171ef8ff0a0ec57ebc75772fc9de578c987059
+paperCommit = cde5587e58f08ce2d8875bb9d13a4be56825e353
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/0003-Add-Brigadier-Command-API.patch

@@ -1913,10 +1913,10 @@ index 9bdeeecdb6021d61fd9141270011e56b06a58a76..0231a38067e4194587217e6e585eb82c
 
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 5cd236965de12392d8c7aa81307c0ff1cc8673b1..5ae0c4fbbbec7e6703cebb2d3067047d9c1d8469 100644
+index 34037d3da2c536bac088e0ff629ee8f1daccc65b..afb0bf721db2ab5cd1405193a4be4a0c11fa5fa8 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-@@ -348,6 +348,49 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -355,6 +355,49 @@ public abstract class JavaPlugin extends PluginBase {
          }
      }
 

patches/0006-Add-More-API-for-EntityDamageEvent.patch

@@ -255,13 +255,13 @@ index 0000000000000000000000000000000000000000..aca7b9e9076a6c48cf3f27f42f841cd0
 +    void setOverrideKnockback(final @Nullable Vector knockback);
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 923d8655a84e26960d35d8dc6e4ebc0b10c295d5..d07cd759d6314afd2a16208ba005158bf7edd8fa 100644
+index c6222fe754dee53f269944c7578dde8106377f20..ef7fdb558170e705bbf29d0c0e973b3e9c1d9c32 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -273,4 +273,6 @@ public interface UnsafeValues {
-      */
-     @Nullable org.bukkit.Color getSpawnEggLayerColor(org.bukkit.entity.EntityType entityType, int layer);
-     // Paper end - spawn egg color visibility
+@@ -283,4 +283,6 @@ public interface UnsafeValues {
+     // Paper end - lifecycle event API
+
+     @NotNull java.util.List<net.kyori.adventure.text.Component> computeTooltipLines(@NotNull ItemStack itemStack, @NotNull io.papermc.paper.inventory.tooltip.TooltipContext tooltipContext, @Nullable org.bukkit.entity.Player player); // Paper - expose itemstack tooltip lines
 +
 +    @NotNull moe.caramel.daydream.world.DamageMata getDamageMeta(@NotNull Object damageSource); // Daydream - Add more API for EntityDamageEvent
  }

patches/0020-Add-ItemStack-Utilities.patch

@@ -5,11 +5,11 @@ Subject: [PATCH] Add ItemStack Utilities
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 0c3ec1a0e69e98c09d272ecfa6a60599633f3008..60a5785f55317d3117e1395e5b0b56b3dff928c4 100644
+index a585555328732ce22f32887c89a221dbace9a3ad..0813483bdfbaa5ce5ea8a3af14df86a4728b0230 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -304,4 +304,18 @@ public interface UnsafeValues {
-     // Paper end - spawn egg color visibility
+@@ -314,4 +314,18 @@ public interface UnsafeValues {
+     @NotNull java.util.List<net.kyori.adventure.text.Component> computeTooltipLines(@NotNull ItemStack itemStack, @NotNull io.papermc.paper.inventory.tooltip.TooltipContext tooltipContext, @Nullable org.bukkit.entity.Player player); // Paper - expose itemstack tooltip lines
 
      @NotNull moe.caramel.daydream.world.DamageMata getDamageMeta(@NotNull Object damageSource); // Daydream - Add more API for EntityDamageEvent
 +
@@ -28,7 +28,7 @@ index 0c3ec1a0e69e98c09d272ecfa6a60599633f3008..60a5785f55317d3117e1395e5b0b56b3
 +    // Daydream end - Add ItemStack Utilities
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7adf54c561d64e6337af8a2d86f6b574b083edb5..2bf9b673899ee7b0f38084448c8102891dab34b9 100644
+index 245a730a54c4b241a9a67eccceefafd2763bd238..e55f7c30a3426cdf412bbdac7ec9ed3f3ea3f23d 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -34,6 +34,99 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

patches/0023-Add-more-Entity-API.patch

@@ -60,10 +60,10 @@ index 72324b823027edad59c9b916db238394198e5762..be19584591f30ed9780bf05e5dfc91b2
      /**
       * Gets the metadata of the entity.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 0f0b965ce48d13a64b5546a0abcfb45c4f5f4722..e911fed0df308e65c11efd4fb617571def7126d8 100644
+index e67455efc84f1e06d3396291d104ce65fee4591b..9a3c02e62b0d9096af86464f91e04cb664280912 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -630,6 +630,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -664,6 +664,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
      public boolean hasLineOfSight(@NotNull Location location);
      // Paper end
 

patches/0031-Add-EnhancedModelEngine-Support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add EnhancedModelEngine Support
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 60a5785f55317d3117e1395e5b0b56b3dff928c4..6febf6877c10c8f2cc1f6495e8863c4649b549b9 100644
+index 0813483bdfbaa5ce5ea8a3af14df86a4728b0230..e569b3507fad6a5f2e1e64ce102f072edb1b36f7 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -318,4 +318,30 @@ public interface UnsafeValues {
+@@ -328,4 +328,30 @@ public interface UnsafeValues {
      @org.jetbrains.annotations.NotNull
      ItemStack newItem(@org.jetbrains.annotations.NotNull org.bukkit.Material material, int count);
      // Daydream end - Add ItemStack Utilities