Update upstream(Luminol-lithium-sleeping-block-entity)

lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Rebrand to Lophine
 
 
 diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java
-index 0a3fa2756dae0eea9e2c0fa6bbaa425584763036..6c1cb2866c81a1bc861289aedb2c318f910a8498 100644
+index a67fc80eb3182415557b4bdf7f146aefb43103da..52fec4c88fee3c027c954365538516aaa8335c7f 100644
 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java
 +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java
-@@ -19,6 +19,7 @@ public class ConfigManager {
+@@ -21,6 +21,7 @@ public class ConfigManager {
  
-     public static void initConfigs() throws IOException {
+     public static void initConfigs() {
          configfiles.put("luminol", ConfigsInstance.of(new File("luminol_config"), "luminol", "me.earthme.luminol.config.modules"));
 +        configfiles.put("lophine", ConfigsInstance.of(new File("lophine_config"), "lophine", "fun.bm.lophine.config.modules")); // add lophine config to global config
          preLoad();

lophine-server/luminol-patches/features/0002-Transformed-Configs.patch

@@ -16,3 +16,15 @@ index 531214d7ab28ece4bf84e82b39d1c9f983f0fb0c..b68fa0427bb975e91e76f73ab4cc089a
      @ConfigInfo(baseName = "enabled")
      public static boolean enabled = false;
  
+diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
+index c269446dda05cfc848407f80f53820c8fcd0c7b4..e69ffae53aa24496a29a4c4890cdcb366d2bec12 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
++++ b/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
+@@ -5,6 +5,7 @@ import me.earthme.luminol.config.IConfigModule;
+ import me.earthme.luminol.config.flags.ConfigInfo;
+ 
+ public class PaperPacketLimiterConfig implements IConfigModule {
++    @me.earthme.luminol.config.flags.TransformedConfig(name = "unlimit-packet", category = {"misc", "network"}, originInstance = "lophine")
+     @ConfigInfo(baseName = "force_disable")
+     public static boolean forceDisable = false;
+ 

lophine-server/minecraft-patches/features/0003-Add-config-to-enable-cross-region-damage-trace.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Helvetica Volubi <suisuroru@blue-millennium.fun>
 Date: Tue, 29 Apr 2025 23:03:56 +0800
-Subject: [PATCH] Add config to enable Cross Region Damage trace
+Subject: [PATCH] Add config to enable cross region damage trace
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java

lophine-server/minecraft-patches/features/0004-Add-config-to-enable-datapack-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable datapack command
 
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 0d5ed9602492c8393088954105e9a19032067b8b..e2fc15d84fafde6847ecead23c55169449275e1b 100644
+index 8a90aa5c145f53afbb3f2371f97cb09974f30bbb..b6e10157c572dadb1bff18f8431166966eed46d9 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
 @@ -192,7 +192,9 @@ public class Commands {
@@ -20,7 +20,7 @@ index 0d5ed9602492c8393088954105e9a19032067b8b..e2fc15d84fafde6847ecead23c551694
          DefaultGameModeCommands.register(this.dispatcher);
          //DialogCommand.register(this.dispatcher, context); // Folia - region threading - TODO
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 86d20d884fb59d0121bdcc291af1fc97b8bf603d..a0f1db50adf5163a671d3d9e9df7adb7de4250c6 100644
+index 100e8fdc52c201d386e3c779d19f6b5abde39820..d08a5b553f4e5932d960fbcdeb6a43419730e32a 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -2352,6 +2352,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

lophine-server/minecraft-patches/features/0005-Add-config-to-enable-raytracing-tracker.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MrHua269 <wangxyper@163.com>
 Date: Wed, 5 Feb 2025 15:22:19 +0800
-Subject: [PATCH] Add config to enable Raytracing tracker
+Subject: [PATCH] Add config to enable raytracing tracker
 
 
 diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java

lophine-server/minecraft-patches/features/0006-Add-config-to-enable-tick-command.patch

@@ -97,10 +97,10 @@ index 0357792de0ed8ec9058d1847c8b45c33ff365af6..4945c11f573a53df2f5be4beb7af6a3f
                  this.scheduler.regionFailed(this, false, thr);
                  // regionFailed will schedule a shutdown, so we should avoid letting this region tick further
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 8a90aa5c145f53afbb3f2371f97cb09974f30bbb..0d5ed9602492c8393088954105e9a19032067b8b 100644
+index b6e10157c572dadb1bff18f8431166966eed46d9..e2fc15d84fafde6847ecead23c55169449275e1b 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -243,7 +243,11 @@ public class Commands {
+@@ -245,7 +245,11 @@ public class Commands {
          TeleportCommand.register(this.dispatcher);
          TellRawCommand.register(this.dispatcher, context);
          //TestCommand.register(this.dispatcher, context); // Folia - region threading
@@ -114,7 +114,7 @@ index 8a90aa5c145f53afbb3f2371f97cb09974f30bbb..0d5ed9602492c8393088954105e9a190
          TitleCommand.register(this.dispatcher, context);
          //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 2ed2f4cca3a81117c0beaf7a11bbbe8156f6a9ce..6675b83c9f15d0341dcf169ec3ac20f401c5d10b 100644
+index d08a5b553f4e5932d960fbcdeb6a43419730e32a..a0f1db50adf5163a671d3d9e9df7adb7de4250c6 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -267,7 +267,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

lophine-server/minecraft-patches/features/0008-Leaves-Base-Protocol-Core.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Helvetica Volubi <suisuroru@blue-millennium.fun>
 Date: Sun, 3 Aug 2025 15:24:01 +0800
-Subject: [PATCH] Leaves: Leaves Protocol Core
+Subject: [PATCH] Leaves: Base Protocol Core
 
 Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
 As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc14e2e0225009cf9919072f7f/leaves-server/minecraft-patches/features/0004-Leaves-Protocol-Core.patch)

lophine-server/minecraft-patches/features/0009-Leaves-Disable-packet-limit.patch

@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Sun, 27 Jul 2025 13:48:10 +0800
-Subject: [PATCH] Leaves: Disable packet limit
-
-Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
-As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/6a2b9ee6b330cd18b0a8eb2a824d561fa76012bb/leaves-server/minecraft-patches/features/0043-Disable-packet-limit.patch)
-Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-
-diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index 9c7366fce56f2c8105c2e5b48f8d618e028f2604..7ab1d97081ffa8cd7ce69cf3165a312697f1fdbc 100644
---- a/net/minecraft/network/Connection.java
-+++ b/net/minecraft/network/Connection.java
-@@ -281,8 +281,8 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-                 if (this.stopReadingPackets) {
-                     return;
-                 }
--                if (this.allPacketCounts != null ||
--                    io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.overrides.containsKey(packet.getClass())) {
-+                if (!fun.bm.lophine.config.modules.optimizations.NetworkConfig.disablePacketLimit && (this.allPacketCounts != null || // Leaves - can disable
-+                    io.papermc.paper.configuration.GlobalConfiguration.get().packetLimiter.overrides.containsKey(packet.getClass()))) { // Leaves - can disable
-                     long time = System.nanoTime();
-                     synchronized (PACKET_LIMIT_LOCK) {
-                         if (this.allPacketCounts != null) {
-diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 227f0c315582b9c499915bebfb820049839466e6..1d52376f034dc5690e8b399512146b47b92c3c14 100644
---- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -856,7 +856,7 @@ public class ServerGamePacketListenerImpl
-     public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
-         // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level()); // Paper - AsyncTabCompleteEvent; run this async
-         // CraftBukkit start
--        if (!this.tabSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) { // Paper - configurable tab spam limits
-+        if (!fun.bm.lophine.config.modules.optimizations.NetworkConfig.disablePacketLimit && !this.tabSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) { // Paper - configurable tab spam limits // Leaves - can disable
-             this.disconnectAsync(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - Kick event cause // Paper - add proper async disconnect
-             return;
-         }
-@@ -2047,6 +2047,7 @@ public class ServerGamePacketListenerImpl
-     private static int getSpamThreshold() { return io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.incomingPacketThreshold; } // Paper - Configurable threshold
- 
-     private boolean checkLimit(long timestamp) {
-+        if (fun.bm.lophine.config.modules.optimizations.NetworkConfig.disablePacketLimit) return true; // Leaves - disable
-         if (this.lastLimitedPacket != -1 && timestamp - this.lastLimitedPacket < getSpamThreshold() && this.limitedPackets++ >= 8) { // Paper - Configurable threshold; raise packet limit to 8
-             return false;
-         }
-@@ -2586,6 +2587,7 @@ public class ServerGamePacketListenerImpl
- 
-     // Spigot start - spam exclusions
-     private void detectRateSpam(String message) {
-+        if (fun.bm.lophine.config.modules.optimizations.NetworkConfig.disablePacketLimit) return; // Leaves - disable
-         // CraftBukkit start - replaced with thread safe throttle
-         if (org.spigotmc.SpigotConfig.enableSpamExclusions) {
-             for (String exclude : org.spigotmc.SpigotConfig.spamExclusions) {
-@@ -3335,7 +3337,7 @@ public class ServerGamePacketListenerImpl
-     @Override
-     public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
-         // Paper start - auto recipe limit
--        if (!org.bukkit.Bukkit.isPrimaryThread()) {
-+        if (!fun.bm.lophine.config.modules.optimizations.NetworkConfig.disablePacketLimit && !org.bukkit.Bukkit.isPrimaryThread()) { // Leaves - can disable
-             if (!this.recipeSpamPackets.isIncrementAndUnderThreshold()) {
-                 this.disconnectAsync(net.minecraft.network.chat.Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause // Paper - add proper async disconnect
-                 return;

lophine-server/minecraft-patches/features/0009-Leaves-Item-overstack-util.patch

@@ -41,7 +41,7 @@ index f7002d6752aa03603eb06e298ba1d7130cf13826..72c87f7c0392d087440db9d267a60859
          if (count > i) {
              source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName()));
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1d52376f034dc5690e8b399512146b47b92c3c14..4b215dc69887df9382bde4cfa2f37afadfe1bcb2 100644
+index d74a05822c6c145971dc526a62d652d35b4f5d9d..d63d8f7523938088bf9efc1c1b8ad9f0583338bb 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3079,7 +3079,7 @@ public class ServerGamePacketListenerImpl

lophine-server/minecraft-patches/features/0016-Disable-some-check-for-operators.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable some check for operators
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4b215dc69887df9382bde4cfa2f37afadfe1bcb2..3ce1e5a7d7095c15250b94d032587f584119824d 100644
+index d63d8f7523938088bf9efc1c1b8ad9f0583338bb..b40059553089207ab1c6628beefadc674ec43d4e 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -367,7 +367,7 @@ public class ServerGamePacketListenerImpl

lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/ContainerExpansionConfig.java

@@ -20,9 +20,7 @@ public class ContainerExpansionConfig implements IConfigModule {
                     range: 1~64""")
     public static int shulkerCount = 1;
 
-    @ConfigInfo(baseName = "same_nbt_shulker_stackable", comments =
-            """
-                    range: 1~64""")
+    @ConfigInfo(baseName = "same_nbt_shulker_stackable")
     public static boolean nbtShulkerStackable = false;
 
     @Override

lophine-server/src/main/java/fun/bm/lophine/config/modules/optimizations/NetworkConfig.java

@@ -1,21 +0,0 @@
-package fun.bm.lophine.config.modules.optimizations;
-
-import me.earthme.luminol.config.EnumConfigCategory;
-import me.earthme.luminol.config.IConfigModule;
-import me.earthme.luminol.config.flags.ConfigInfo;
-
-public class NetworkConfig implements IConfigModule {
-    @ConfigInfo(baseName = "unlimit-packet", comments = """
-            Disable packet limit""")
-    public static boolean disablePacketLimit = false;
-
-    @Override
-    public EnumConfigCategory getCategory() {
-        return EnumConfigCategory.OPTIMIZATIONS;
-    }
-
-    @Override
-    public String getBaseName() {
-        return "network";
-    }
-}