Update upstream(Luminol)

Co-authored by: MC_XiaoHei <xor7xiaohei@gmail.com>
As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/3e96b237749a960f297f211d439ffc9ea7fd2381/leaves-server/minecraft-patches/features/0134-Old-wet-tnt-explode-behavior.patch)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

build.gradle.kts

@@ -69,7 +69,6 @@ subprojects {
         options.encoding = Charsets.UTF_8.name()
         options.release = 21
         options.isFork = true
-        options.forkOptions.memoryMaximumSize = "6g" // Prevent OOM during building
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()

gradle.properties

@@ -2,7 +2,7 @@ group=fun.bm.lophine
 version=1.21.7-R0.1-SNAPSHOT
 mcVersion=1.21.7
 
-luminolRef=83e90d6c0829b505ba89b31b2e7e0b2efae07057
+luminolRef=2737c7a3a47cfc63ea74f21386080412b9a08d0b
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

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

@@ -20,13 +20,14 @@ 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 c285fb3b0e6d3eeda8d4c9132dbd917f4f8ec20c..8e7c65538290b6bb3650d01652216d75ad65cd1a 100644
+index c285fb3b0e6d3eeda8d4c9132dbd917f4f8ec20c..065f6fcf20939f79b647ffeee63dd4d8f5133bae 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -2348,6 +2348,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2348,6 +2348,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
      }
  
++    // Lophine start - region thread skip reload // TODO - add reload support
 +    public void saveDatapacks(Collection<String> selectedIds) {
 +        this.packRepository.setSelected(selectedIds, false); // Paper - add pendingReload flag to determine required pack loading - false as this is *after* a reload (see above)
 +        WorldDataConfiguration worldDataConfiguration = new WorldDataConfiguration(
@@ -34,22 +35,25 @@ index c285fb3b0e6d3eeda8d4c9132dbd917f4f8ec20c..8e7c65538290b6bb3650d01652216d75
 +        );
 +        this.worldData.setDataConfiguration(worldDataConfiguration);
 +    }
++    // Lophine end - region thread skip reload // TODO - add reload support
 +
      public CompletableFuture<Void> reloadResources(Collection<String> selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause cause) {
          // Paper end - Add ServerResourcesReloadedEvent
          CompletableFuture<Void> completableFuture = CompletableFuture.<ImmutableList>supplyAsync(
 diff --git a/net/minecraft/server/commands/ReloadCommand.java b/net/minecraft/server/commands/ReloadCommand.java
-index b540a3c3a02f7242578a63477e34b9063e86f1d2..d4f8cb40040dcd2a5175845b5faf3b994fc64fac 100644
+index b540a3c3a02f7242578a63477e34b9063e86f1d2..9f0adf157872e1c68cd7752a24eacdc636e8d17a 100644
 --- a/net/minecraft/server/commands/ReloadCommand.java
 +++ b/net/minecraft/server/commands/ReloadCommand.java
-@@ -16,6 +16,10 @@ public class ReloadCommand {
+@@ -16,6 +16,12 @@ public class ReloadCommand {
      private static final Logger LOGGER = LogUtils.getLogger();
  
      public static void reloadPacks(Collection<String> selectedIds, CommandSourceStack source) {
++        // Lophine start - region thread skip reload // TODO - add reload support
 +        if (true) {
 +            source.getServer().saveDatapacks(selectedIds);
 +            return;
-+        } // Lophine - region thread skip reload // TODO - add reload support
++        }
++        // Lophine end - region thread skip reload // TODO - add reload support
          source.getServer().reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally(throwable -> { // Paper - Add ServerResourcesReloadedEvent
              LOGGER.warn("Failed to execute reload", throwable);
              source.sendFailure(Component.translatable("commands.reload.failure"));

lophine-server/minecraft-patches/features/0009-Add-config-to-allow-infinite-trade.patch

@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 7 Jul 2025 16:30:54 +0800
+Subject: [PATCH] Add config to allow infinite trade
+
+
+diff --git a/net/minecraft/world/item/trading/Merchant.java b/net/minecraft/world/item/trading/Merchant.java
+index 6e2fa442ddcd4ef3c4fe789b9ebac9dd409c9de7..a876335e26daec9a9a3a2f00ee5cb23cfd913aa6 100644
+--- a/net/minecraft/world/item/trading/Merchant.java
++++ b/net/minecraft/world/item/trading/Merchant.java
+@@ -42,7 +42,14 @@ public interface Merchant {
+             new SimpleMenuProvider((containerId, inventory, player1) -> new MerchantMenu(containerId, inventory, this), displayName)
+         );
+         if (optionalInt.isPresent()) {
+-            MerchantOffers offers = this.getOffers();
++            // Lophine start - infinite trade
++            MerchantOffers offers = this.getOffers().copy();
++            if (fun.bm.lophine.config.modules.misc.VillagerConfig.villagerInfiniteTrade) {
++                for (MerchantOffer merchantOffer : offers) {
++                    merchantOffer.maxUses = 16384;
++                }
++            }
++            // Lophine end - infinite trade
+             if (!offers.isEmpty()) {
+                 player.sendMerchantOffers(optionalInt.getAsInt(), offers, level, this.getVillagerXp(), this.showProgressBar(), this.canRestock());
+             }
+diff --git a/net/minecraft/world/item/trading/MerchantOffer.java b/net/minecraft/world/item/trading/MerchantOffer.java
+index 64c99df8ff305fa28c75dc03fc5ef8c61634ad84..21ec77d5167cfdf05043ea474165148fb2b0c2d9 100644
+--- a/net/minecraft/world/item/trading/MerchantOffer.java
++++ b/net/minecraft/world/item/trading/MerchantOffer.java
+@@ -196,7 +196,7 @@ public class MerchantOffer {
+     }
+ 
+     public boolean isOutOfStock() {
+-        return this.uses >= this.maxUses;
++        return (this.uses >= this.maxUses && !fun.bm.lophine.config.modules.misc.VillagerConfig.villagerInfiniteTrade); // Lophine - infinite trade
+     }
+ 
+     public void setToOutOfStock() {

lophine-server/minecraft-patches/features/0010-Add-config-to-enable-unsafe-waypoint-bar.patch

@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 7 Jul 2025 18:19:00 +0800
+Subject: [PATCH] Add config to enable unsafe waypoint bar
+
+
+diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
+index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..36e9b027ce5213f8914728293633e78e9905c1b2 100644
+--- a/net/minecraft/server/waypoints/ServerWaypointManager.java
++++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
+@@ -22,7 +22,14 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+ 
+     @Override
+     public void trackWaypoint(WaypointTransmitter waypoint) {
+-        // Folia - region threading
++        // Lophine start - unsafe waypoint bar
++        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
++        this.waypoints.add(waypoint);
++
++        for (ServerPlayer serverPlayer : this.players) {
++            this.createConnection(serverPlayer, waypoint);
++        }
++        // Lophine end - unsafe waypoint bar
+     }
+ 
+     @Override
+@@ -50,14 +57,48 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
+ 
+     public void addPlayer(ServerPlayer player) {
+         // Folia - region threading
++        // Lophine start - unsafe waypoint bar
++        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
++        this.players.add(player);
++
++        for (WaypointTransmitter waypointTransmitter : this.waypoints) {
++            this.createConnection(player, waypointTransmitter);
++        }
++
++        if (player.isTransmittingWaypoint()) {
++            this.trackWaypoint((WaypointTransmitter)player);
++        }
++        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void updatePlayer(ServerPlayer player) {
+         // Folia - region threading
++        // Lophine start - unsafe waypoint bar
++        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
++        Map<WaypointTransmitter, WaypointTransmitter.Connection> map = this.connections.row(player);
++        SetView<WaypointTransmitter> set = Sets.difference(this.waypoints, map.keySet());
++
++        for (Entry<WaypointTransmitter, WaypointTransmitter.Connection> entry : ImmutableSet.copyOf(map.entrySet())) {
++            this.updateConnection(player, entry.getKey(), entry.getValue());
++        }
++
++        for (WaypointTransmitter waypointTransmitter : set) {
++            this.createConnection(player, waypointTransmitter);
++        }
++        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void removePlayer(ServerPlayer player) {
+         // Folia - region threading
++        // Lophine start - unsafe waypoint bar
++        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
++        this.connections.row(player).values().removeIf(connection -> {
++            connection.disconnect();
++            return true;
++        });
++        this.untrackWaypoint((WaypointTransmitter)player);
++        this.players.remove(player);
++        // Lophine end - unsafe waypoint bar
+     }
+ 
+     public void breakAllConnections() {

lophine-server/minecraft-patches/features/0012-Stackable-ShulkerBoxes.patch

@@ -37,7 +37,7 @@ index 5a1c21b05545a03fbb00cf734605049870d3eecb..2ade5ce23cdab08b1746e2cbe99bfe1d
          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 513cbbf227c5037ee77055473e8815eb05496679..5af3293a532124c2a0e8797efb729de750f33628 100644
+index e87d6a5e0fe2789ab2518a2b3558e7c0c2320feb..347e5e1c773f7c4566825204d2d71aa3ec20333c 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3064,7 +3064,7 @@ public class ServerGamePacketListenerImpl

lophine-server/minecraft-patches/features/0014-Old-Explosion-Damage-Calculator.patch

@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 7 Jul 2025 15:33:57 +0800
+Subject: [PATCH] Old Explosion Damage Calculator
+
+Co-authored by: MC_XiaoHei <xor7xiaohei@gmail.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/3e96b237749a960f297f211d439ffc9ea7fd2381/leaves-server/minecraft-patches/features/0134-Old-wet-tnt-explode-behavior.patch)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
+index b3e897a4afee742b5055d652ad7047a660d8ea04..cf8869fac003c73024634078b2f7b36cddda640e 100644
+--- a/net/minecraft/world/level/ServerExplosion.java
++++ b/net/minecraft/world/level/ServerExplosion.java
+@@ -729,6 +729,7 @@ public class ServerExplosion implements Explosion {
+     public boolean shouldAffectBlocklikeEntities() {
+         boolean _boolean = this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
+         boolean flag = this.source == null || this.source.getType() != EntityType.BREEZE_WIND_CHARGE && this.source.getType() != EntityType.WIND_CHARGE;
++        if (fun.bm.lophine.config.modules.misc.OldFeatureConfig.oldExplosionDamageCalculator) flag = flag && (this.source == null || !this.source.isInWater()); // Leaves - Old MC TNT wet explosion no item damage
+         return _boolean ? flag : this.blockInteraction.shouldAffectBlocklikeEntities() && flag;
+     }
+ 

lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java

@@ -0,0 +1,22 @@
+package fun.bm.lophine.config.modules.experiment;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+public class WaypointConfig implements IConfigModule {
+    @ConfigInfo(baseName = "enable-waypoint", comments =
+            """
+                    Enable waypoint bar unsafe""")
+    public static boolean forceEnableWaypointUnsafe = false;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.EXPERIMENT;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "waypoint bar";
+    }
+}

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

@@ -14,6 +14,9 @@ public class OldFeatureConfig implements IConfigModule {
     @ConfigInfo(baseName = "old_replaceable_by_mushrooms")
     public static boolean oldReplaceableByMushrooms = false;
 
+    @ConfigInfo(baseName = "old_explosion_damage_calculator")
+    public static boolean oldExplosionDamageCalculator = false;
+
     @Override
     public EnumConfigCategory getCategory() {
         return EnumConfigCategory.MISC;

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

@@ -0,0 +1,23 @@
+package fun.bm.lophine.config.modules.misc;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+public class VillagerConfig implements IConfigModule {
+    @ConfigInfo(baseName = "villager-infinite-trade", comments =
+            """
+                    Allow villager infinite trade (limit of 16384 times)
+                        ---- we won't edit saved data, only edit in send data to client.""")
+    public static boolean villagerInfiniteTrade = false;
+
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.MISC;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "villager-config";
+    }
+}