merge some patches

lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch

@@ -1,27 +1,27 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 12 Jan 2025 10:18:38 +0800
+Date: Sun, 8 Jun 2025 01:23:55 +0800
-Subject: [PATCH] Rebrand to Luminol
+Subject: [PATCH] Rebrand to Lophine
 
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 652ff54e7c50412503725d628bfe72ed03059790..db5e2f10278c20286779362cfdfadb2f42c724e0 100644
+index 652ff54e7c50412503725d628bfe72ed03059790..273bd3f354281c7ddbe2a3719be063b1d46e5445 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
 @@ -19,6 +19,17 @@ public interface ServerBuildInfo {
       */
      Key BRAND_PAPER_ID = Key.key("papermc", "paper");
  
-+    // Luminol start
++    // Lophine start
 +    /**
 +     * The brand id for folia
 +     */
 +    Key BRAND_FOLIA_ID = Key.key("papermc", "folia");
 +    /**
-+     * The brand id for Luminol.
++     * The brand id for Lophine.
 +     */
-+    Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");
++    Key BRAND_LOPHINE_ID = Key.key("luminolmc", "lophine");
-+    // Luminol end
++    // Lophine end
 +
      /**
       * Gets the {@code ServerBuildInfo}.

lophine-api/paper-patches/features/0010-Leaves-Fix-SculkCatalyst-exp-skip.patch

@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sat, 24 May 2025 01:25:10 +0800
-Subject: [PATCH] Leaves: Fix SculkCatalyst exp skip
-
-Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
-As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc14e2e0225009cf9919072f7f/leaves-api/paper-patches/features/0007-Fix-SculkCatalyst-exp-skip.patch)
-Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-
-diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
-index 76c08499b704a6cb0cb95ce69b9a9248d69cc127..d516595a8675a9f3d9c14658b66160ba4b3c4278 100644
---- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
-@@ -27,6 +27,7 @@ public class EntityDeathEvent extends EntityEvent implements Cancellable {
-     @Nullable private org.bukkit.SoundCategory deathSoundCategory;
-     private float deathSoundVolume;
-     private float deathSoundPitch;
-+    private int rewardExp; // Leaves - exp fix
- 
-     private boolean cancelled;
- 
-@@ -35,13 +36,20 @@ public class EntityDeathEvent extends EntityEvent implements Cancellable {
-         this(livingEntity, damageSource, drops, 0);
-     }
- 
--    @ApiStatus.Internal
-     public EntityDeathEvent(@NotNull final LivingEntity livingEntity, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops, final int droppedExp) {
-+        // Leaves start - exp fix
-+        this(livingEntity, damageSource, drops, droppedExp, droppedExp);
-+    }
-+
-+    @ApiStatus.Internal
-+    public EntityDeathEvent(@NotNull final LivingEntity livingEntity, @NotNull DamageSource damageSource, @NotNull final List<ItemStack> drops, final int droppedExp, final int rewardExp) {
-         super(livingEntity);
-         this.damageSource = damageSource;
-         this.drops = drops;
-         this.dropExp = droppedExp;
-+        this.rewardExp = rewardExp;
-     }
-+    // Leaves end - exp fix
- 
-     @NotNull
-     @Override
-@@ -230,4 +238,14 @@ public class EntityDeathEvent extends EntityEvent implements Cancellable {
-     public static HandlerList getHandlerList() {
-         return HANDLER_LIST;
-     }
-+
-+    // Leaves start - exp fix
-+    public int getRewardExp() {
-+        return rewardExp;
-+    }
-+
-+    public void setRewardExp(int rewardExp) {
-+        this.rewardExp = rewardExp;
-+    }
-+    // Leaves end - exp fix
- }
-diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index 78497c423edaff9550315610ccc2f3d4d3614dce..187fb47ba43d300997f19ecb82ddc41fdd312ec1 100644
---- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-@@ -25,6 +25,7 @@ public class PlayerDeathEvent extends EntityDeathEvent {
-     private boolean doExpDrop;
-     private boolean keepLevel = false;
-     private boolean keepInventory = false;
-+    private boolean useApiExpDropStatus = false; // Leaves - exp fix
-     @Deprecated
-     private final List<ItemStack> itemsToKeep = new ArrayList<>();
- 
-@@ -82,8 +83,15 @@ public class PlayerDeathEvent extends EntityDeathEvent {
-         this.showDeathMessages = true;
-         this.deathMessage = LegacyComponentSerializer.legacySection().deserializeOrNull(deathMessage);
-         this.doExpDrop = doExpDrop;
-+        this.useApiExpDropStatus = true; // Leaves - exp fix
-     }
- 
-+    // Leaves start - exp fix
-+    public boolean forceUseEventDropStatus() {
-+        return this.useApiExpDropStatus;
-+    }
-+    // Leaves end - exp fix
-+
-     @NotNull
-     @Override
-     public Player getEntity() {

lophine-api/paper-patches/features/0013-Rebrand-to-Lophine.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 8 Jun 2025 01:23:55 +0800
-Subject: [PATCH] Rebrand to Lophine
-
-
-diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index db5e2f10278c20286779362cfdfadb2f42c724e0..c18c0cb45a193883aa12b5d1abe690e95d289f82 100644
---- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
-+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -29,6 +29,7 @@ public interface ServerBuildInfo {
-      */
-     Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");
-     // Luminol end
-+    Key BRAND_LOPHINE_ID = Key.key("luminolmc", "lophine"); // Lophine
- 
-     /**
-      * Gets the {@code ServerBuildInfo}.