Add trigger command unsafe support

[ci skip] switch to release
because of no code update, we will start release next commit
2026-06-04 01:02:14 +08:00 · 2026-06-04 00:53:49 +08:00 · 2026-06-03 20:19:26 +08:00 · 2026-06-03 13:57:27 +08:00 · 2026-06-03 13:25:28 +08:00 · 2026-06-03 13:22:25 +08:00
47 changed files with 141 additions and 25 deletions
@@ -1,11 +1,11 @@
 group=fun.bm.lophine
 mcVersion=26.1.2
 apiVersion=26.1.2
-channel=BETA
+channel=STABLE
 clipVersion=3.0.17
 weightVersion=2.0.12
 # true for release, false for skip release, pre for pre-release
-release=pre
+release=true
 # true for push to repo, false for skip push repo, auto for detect by release value
 pushRepo=auto

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 3 Jun 2026 13:49:39 +0800
+Subject: [PATCH] Update suppression event
+
+
+diff --git a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+index 1f3fe7f786bb8f7c59e3a0235dcc572f3171ee6b..5bae7e78f4b16f399e261d95527ba9f40b0e90c4 100644
+--- a/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+++ b/src/main/java/org/leavesmc/leaves/plugin/ServerFeatureManager.java
+@@ -13,6 +13,7 @@ public class ServerFeatureManager implements FeatureManager {
+     private ServerFeatureManager() {
+         availableFeatures.add(FAKEPLAYER); // Lophine - fakeplayer support
+         availableFeatures.add(PHOTOGRAPHER); // Lophine - Replay Mod API support
+        availableFeatures.add(UPDATE_SUPPRESSION_EVENT); // Lophine - update suppression event support
+         if (Boolean.getBoolean("leavesclip.enable.mixin")) {
+             availableFeatures.add(MIXIN);
+         }
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Thu, 4 Jun 2026 00:56:32 +0800
+Subject: [PATCH] Add config to enable trigger command
+
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index f54f6047f326189329e11338b17105f5555dde12..0d34c0a6187805a250d44c8a2d39a7d313c158e5 100644
+--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
+@@ -268,7 +268,11 @@ public class Commands {
+         //TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
+         TimeCommand.register(this.dispatcher, context);
+         TitleCommand.register(this.dispatcher, context);
+-        //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
+        // Lophine start - Add a config to enable trigger command
+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.trigger) {
+            TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
+        }
+        // Lophine end - Add a config to enable trigger command
+         if (me.earthme.luminol.config.modules.experiment.CommandConfig.waypointsAndWaypointCommand) WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later // Luminol - Restore waypoints
+         WeatherCommand.register(this.dispatcher);
+         WorldBorderCommand.register(this.dispatcher);
@@ -98,7 +98,7 @@ index 8b09834ec36f62a73e388124129afbdfa47e6c25..ce0ace6a0c6b11f124b601d97491fee1
                 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 f54f6047f326189329e11338b17105f5555dde12..6f3143deb9e5ff17fae5920b0a4ba34e3d9545c4 100644
+index 0d34c0a6187805a250d44c8a2d39a7d313c158e5..732ac0451d71c22a2ab2ebeab056a9016f0f2e67 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
@@ -265,7 +265,11 @@ public class Commands {
@@ -113,7 +113,7 @@ index f54f6047f326189329e11338b17105f5555dde12..6f3143deb9e5ff17fae5920b0a4ba34e
 +        // Luminol end - Add a config to enable tick command
         TimeCommand.register(this.dispatcher, context);
         TitleCommand.register(this.dispatcher, context);
-         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
+         // Lophine start - Add a config to enable trigger command
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
 index 82315368d5580563fc77548f22a65d04ec73b622..8dcd684189d953aabddc4f62a3ecc5807c949ce6 100644
 --- a/net/minecraft/server/MinecraftServer.java
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Bacteriawa <A3167717663@hotmail.com>
-Date: Tue, 2 Jun 2026 19:55:06 +0800
+Date: Sat, 7 Feb 2026 23:57:50 +0800
 Subject: [PATCH] Leaves: Catch update suppression crash

 Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Bacteriawa <A3167717663@hotmail.com>
-Date: Tue, 2 Jun 2026 20:06:33 +0800
+Date: Sat, 15 Nov 2025 01:12:39 +0800
 Subject: [PATCH] Leaves: CCE update suppression

 Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Bacteriawa <A3167717663@hotmail.com>
-Date: Tue, 2 Jun 2026 20:15:44 +0800
+Date: Wed, 14 Jun 2023 12:07:07 +0800
 Subject: [PATCH] Leaves: Redstone ignore upwards update

 Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bacteriawa <A3167717663@hotmail.com>
-Date: Tue, 2 Jun 2026 20:32:47 +0800
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 17 Nov 2025 18:41:08 +0800
 Subject: [PATCH] Instant Block Updater


@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bacteriawa <A3167717663@hotmail.com>
-Date: Tue, 2 Jun 2026 20:37:27 +0800
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 18 Nov 2025 00:24:32 +0800
 Subject: [PATCH] Revert TrapDoorBlock changes form Paper


@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bacteriawa <A3167717663@hotmail.com>
-Date: Tue, 2 Jun 2026 20:42:45 +0800
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 18 Nov 2025 00:35:13 +0800
 Subject: [PATCH] Leaves: Prevent loss of item drops due to update suppression
 when breaking blocks

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bacteriawa <A3167717663@hotmail.com>
-Date: Tue, 2 Jun 2026 20:50:57 +0800
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 18 Nov 2025 23:26:27 +0800
 Subject: [PATCH] Leaves: Do not reset placed block on exception & Do not
 prevent block entity and entity crash at LevelChunk

@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Wed, 3 Jun 2026 02:20:00 +0800
+Subject: [PATCH] MiniTweaks mob fire and explosion rules
+
+
+diff --git a/net/minecraft/world/entity/monster/Creeper.java b/net/minecraft/world/entity/monster/Creeper.java
+index 5005f2b923aa94dbc38fb75d5b6f58344888c895..0d4ba81c82b683c32addf6441de3843abf462c3c 100644
+--- a/net/minecraft/world/entity/monster/Creeper.java
+++ b/net/minecraft/world/entity/monster/Creeper.java
+@@ -250,7 +250,8 @@ public class Creeper extends Monster {
+             if (!event.isCancelled()) {
+             // CraftBukkit end
+             this.dead = true;
+-            level.explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit // Paper - fix DamageSource API (revert to vanilla, no, just no, don't change this)
+            Level.ExplosionInteraction explosionInteraction = fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.noCreeperBlockBreaking ? Level.ExplosionInteraction.NONE : Level.ExplosionInteraction.MOB; // Lophine - MiniTweaks noCreeperBlockBreaking
+            level.explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), explosionInteraction); // CraftBukkit // Paper - fix DamageSource API (revert to vanilla, no, just no, don't change this)
+             this.spawnLingeringCloud();
+             this.triggerOnDeathMobEffects(level, Entity.RemovalReason.KILLED);
+             this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
+diff --git a/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireball.java b/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireball.java
+index 711b97aa9e49b7edee34c91d77b1005be4fa96bd..1d9232c9061bde9c545e3ee25bc9c6b0417b9ece 100644
+--- a/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireball.java
+++ b/net/minecraft/world/entity/projectile/hurtingprojectile/LargeFireball.java
+@@ -37,7 +37,9 @@ public class LargeFireball extends Fireball {
+             // CraftBukkit start - fire ExplosionPrimeEvent
+             org.bukkit.event.entity.ExplosionPrimeEvent event = new org.bukkit.event.entity.ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
+             if (event.callEvent()) {
+-                this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB);
+                Level.ExplosionInteraction explosionInteraction = fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.noGhastBlockBreaking ? Level.ExplosionInteraction.NONE : Level.ExplosionInteraction.MOB; // Lophine - MiniTweaks noGhastBlockBreaking
+                boolean createFire = event.getFire() && !fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.disableGhastFire; // Lophine - MiniTweaks disableGhastFire
+                this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), createFire, explosionInteraction);
+             }
+             // CraftBukkit end - fire ExplosionPrimeEvent
+             this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
+diff --git a/net/minecraft/world/entity/projectile/hurtingprojectile/SmallFireball.java b/net/minecraft/world/entity/projectile/hurtingprojectile/SmallFireball.java
+index 1a72ee1559f75660796a9cbc1a9d9cdd6883dc90..480042d9401b6d7618fc2f36f16145606414d475 100644
+--- a/net/minecraft/world/entity/projectile/hurtingprojectile/SmallFireball.java
+++ b/net/minecraft/world/entity/projectile/hurtingprojectile/SmallFireball.java
+@@ -63,7 +63,7 @@ public class SmallFireball extends Fireball {
+         super.onHitBlock(hitResult);
+         if (this.level() instanceof ServerLevel serverLevel) {
+             Entity owner = this.getOwner();
+-            if (this.isIncendiary) { // CraftBukkit
+            if (this.isIncendiary && (!(owner instanceof Mob) || !fun.bm.lophine.carpet.config.modules.GeneralCompatConfig.disableBlazeFire)) { // CraftBukkit // Lophine - MiniTweaks disableBlazeFire
+                 BlockPos pos = hitResult.getBlockPos().relative(hitResult.getDirection());
+                 if (this.level().isEmptyBlock(pos) && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.level(), pos, this).isCancelled()) { // CraftBukkit
+                     this.level().setBlockAndUpdate(pos, BaseFireBlock.getState(this.level(), pos));
@@ -1,4 +1,3 @@
-/*
 package fun.bm.lophine.carpet;

 import fun.bm.lophine.carpet.config.modules.CoreConfig;
@@ -137,4 +136,3 @@ public final class CarpetCompatSync {
        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "hopperCountersUnlimitedSpeed", CounterCompatConfig.hopperCountersUnlimitedSpeed));
    }
 }
-*/
@@ -1,6 +1,8 @@
 package fun.bm.lophine.carpet;

+import ca.spottedleaf.moonrise.common.util.TickThread;
 import com.mojang.logging.LogUtils;
+import io.papermc.paper.threadedregions.RegionizedWorldData;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.tags.BlockTags;
@@ -24,9 +26,10 @@ import java.util.WeakHashMap;

 public final class LagFreeSpawningCompatHelper {
    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final Map<ServerLevel, Map<EntityType<?>, Mob>> PRECOOKED_MOBS = new WeakHashMap<>();
+    private static final Map<RegionizedWorldData, Map<EntityType<?>, Mob>> PRECOOKED_MOBS = new WeakHashMap<>();

    public static boolean hasNoCollision(ServerLevel world, AABB bb) {
+        if (!TickThread.isTickThreadFor(world, bb)) return world.noCollision(bb);
        int minX = Mth.floor(bb.minX);
        int minY = Mth.floor(bb.minY);
        int minZ = Mth.floor(bb.minZ);
@@ -84,15 +87,22 @@ public final class LagFreeSpawningCompatHelper {
    }

    public static @Nullable Mob getOrCreateMob(ServerLevel level, EntityType<?> entityType) {
-        Map<EntityType<?>, Mob> cache = PRECOOKED_MOBS.computeIfAbsent(level, key -> new HashMap<>());
+        RegionizedWorldData data = level.getCurrentWorldData();
+        if (data == null) return createMob(level, entityType);
+        Map<EntityType<?>, Mob> cache = PRECOOKED_MOBS.computeIfAbsent(level.getCurrentWorldData(), key -> new HashMap<>());
        Mob mob = cache.get(entityType);
        if (mob != null && !mob.isRemoved()) {
+            if (!TickThread.isTickThreadFor(mob)) return createMob(level, entityType);
            return mob;
        }

+        return createMob(level, entityType);
+    }
+
+    public static @Nullable Mob createMob(ServerLevel level, EntityType<?> entityType) {
        try {
            if (entityType.create(level, EntitySpawnReason.NATURAL) instanceof Mob created) {
-                cache.put(entityType, created);
+                PRECOOKED_MOBS.get(level.getCurrentWorldData()).put(entityType, created);
                return created;
            }
            LOGGER.warn("Can't precook non-mob entity type: {}", entityType);
@@ -104,7 +114,7 @@ public final class LagFreeSpawningCompatHelper {
    }

    public static void markSpawned(ServerLevel level, EntityType<?> entityType) {
-        Map<EntityType<?>, Mob> cache = PRECOOKED_MOBS.get(level);
+        Map<EntityType<?>, Mob> cache = PRECOOKED_MOBS.get(level.getCurrentWorldData());
        if (cache != null) {
            cache.remove(entityType);
        }
@@ -1,7 +1,6 @@
 package fun.bm.lophine.carpet.config.modules;

-//import fun.bm.lophine.carpet.CarpetCompatSync;
-
+import fun.bm.lophine.carpet.CarpetCompatSync;
 import me.earthme.luminol.config.IConfigModule;
 import me.earthme.luminol.config.flags.ConfigClassInfo;
 import me.earthme.luminol.config.flags.ConfigInfo;
@@ -25,6 +24,6 @@ public class CoreConfig implements IConfigModule {

    @Override
    public void beforeFinalLoad() {
-//        CarpetCompatSync.apply();
+        CarpetCompatSync.apply();
    }
 }
@@ -113,6 +113,22 @@ public class GeneralCompatConfig implements IConfigModule {
            Let explosions damage entities without breaking blocks.""")
    public static boolean explosionNoBlockDamage = false;

+    @ConfigInfo(name = "noCreeperBlockBreaking", comments = """
+            Disables creeper explosion block breaking.""")
+    public static boolean noCreeperBlockBreaking = false;
+
+    @ConfigInfo(name = "noGhastBlockBreaking", comments = """
+            Disables ghast fireball explosion block breaking.""")
+    public static boolean noGhastBlockBreaking = false;
+
+    @ConfigInfo(name = "disableBlazeFire", comments = """
+            Disables fire made from blaze fireballs.""")
+    public static boolean disableBlazeFire = false;
+
+    @ConfigInfo(name = "disableGhastFire", comments = """
+            Disables fire made from ghast fireballs.""")
+    public static boolean disableGhastFire = false;
+
    @ConfigInfo(name = "optimizedTNTHighPriority", comments = """
            Compatibility flag for the already optimized server explosion path carried by the current runtime.""")
    public static boolean optimizedTNTHighPriority = false;
@@ -12,6 +12,11 @@ public class CommandConfig implements IConfigModule {
                    Allow to use tick command""")
    public static boolean tick = false;

+    @ConfigInfo(name = "trigger_command_enabled", comments =
+            """
+                    Allow to use trigger command""")
+    public static boolean trigger = false;
+
    @ConfigInfo(name = "function_command_enabled", comments =
            """
                    Allow to use function command""")
@@ -4,7 +4,6 @@ import me.earthme.luminol.config.IConfigModule;
 import me.earthme.luminol.config.flags.ConfigClassInfo;
 import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.HotReloadUnsupported;
-import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

 /*
Author	SHA1	Message	Date
Helvetica Volubi	1bb1811027	Add trigger command unsafe support	2026-06-04 01:02:14 +08:00
Helvetica Volubi	a4936582bb	[ci skip] switch to release because of no code update, we will start release next commit	2026-06-04 00:53:49 +08:00
Helvetica Volubi	fc760a047f	port: port 1.21.11 changes, fix some bugs in lagFree (https://github.com/LuminolMC/Lophine/issues/145 ) Origin Commit: `311fd32acb`	2026-06-03 20:19:26 +08:00
Helvetica Volubi	5567b194d7	update file's sign & add update suppression event to Leaves Features Manager	2026-06-03 13:57:27 +08:00
Helvetica Volubi	f6f2781237	enabled forgotten config sync	2026-06-03 13:25:28 +08:00
Bacteriawa	f469ad848b	Add MiniTweaks mob fire/explosion rules Add a MiniTweaks patch that adjusts mob explosion and fire behavior and expose new config flags. - Add patch file features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch updating Creeper, LargeFireball and SmallFireball logic to consult config flags when deciding whether explosions break blocks or create fire. - Add four new config options to GeneralCompatConfig: noCreeperBlockBreaking, noGhastBlockBreaking, disableBlazeFire, disableGhastFire. These changes allow disabling creeper/ghast block breaking and suppressing blaze/ghast-caused fire while preserving existing explosion event handling.	2026-06-03 13:22:25 +08:00
Bacteriawa	924ab75f1d	Remove Carpet features patches and protocols Delete Carpet integration: remove luminol and minecraft Carpet feature patch files (1todos/server/luminol-patches/features/0006-Carpet-features.patch and 1todos/server/minecraft-patches/features/0044-Carpet-features.patch) and remove related protocol implementations (1todos/server/src/lophine/protocol/CarpetLoggerProtocol.java and 1todos/server/src/lophine/protocol/tiscm/TISCMProtocol.java). These files contained the Carpet feature backport/compat patches and protocol helpers; removing them cleans up the obsolete Carpet-specific changes.	2026-06-03 13:22:25 +08:00
Bacteriawa	1b2f577e42	Add Carpet features, update Leaves patches Register a new lophine_carpet config and add Carpet feature patches and protocol classes. Adds luminol and minecraft Carpet feature patches, plus CarpetLoggerProtocol and TISCMProtocol Java files. Updates many Leaves-related patch files (metadata and authors/dates) and applies Leaves behaviour changes across numerous block classes (onRemove handling, affectNeighborsAfterRemoval wiring, Containers.dropContentsOnDestroy, etc.) to preserve pre-1.21.1 behaviour and compatibility. These changes enable Carpet integration and ensure Leaves patches are consistently applied across the codebase.	2026-06-03 13:22:24 +08:00