diff --git a/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-cross-region-damage-trace.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0006-Add-config-to-enable-cross-region-damage-trace.patch rename to lophine-server/minecraft-patches/features/0005-Add-config-to-enable-cross-region-damage-trace.patch diff --git a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-save-all-command.patch b/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-save-all-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0005-Add-config-to-enable-save-all-command.patch rename to lophine-server/minecraft-patches/features/0006-Add-config-to-enable-save-all-command.patch diff --git a/lophine-server/minecraft-patches/features/0009-Add-config-to-enable-trigger-command.patch b/lophine-server/minecraft-patches/features/0009-Add-config-to-enable-trigger-command.patch new file mode 100644 index 0000000..0f07dd6 --- /dev/null +++ b/lophine-server/minecraft-patches/features/0009-Add-config-to-enable-trigger-command.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Helvetica Volubi +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); diff --git a/lophine-server/minecraft-patches/features/0014-Add-config-to-enable-tick-command.patch b/lophine-server/minecraft-patches/features/0010-Add-config-to-enable-tick-command.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0014-Add-config-to-enable-tick-command.patch rename to lophine-server/minecraft-patches/features/0010-Add-config-to-enable-tick-command.patch index 94b9cd6..2c13ee7 100644 --- a/lophine-server/minecraft-patches/features/0014-Add-config-to-enable-tick-command.patch +++ b/lophine-server/minecraft-patches/features/0010-Add-config-to-enable-tick-command.patch @@ -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 diff --git a/lophine-server/minecraft-patches/features/0010-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0011-Add-config-to-enable-raytracing-tracker.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0010-Add-config-to-enable-raytracing-tracker.patch rename to lophine-server/minecraft-patches/features/0011-Add-config-to-enable-raytracing-tracker.patch diff --git a/lophine-server/minecraft-patches/features/0009-Modify-merge-ItemEntity-logic.patch b/lophine-server/minecraft-patches/features/0012-Modify-merge-ItemEntity-logic.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0009-Modify-merge-ItemEntity-logic.patch rename to lophine-server/minecraft-patches/features/0012-Modify-merge-ItemEntity-logic.patch diff --git a/lophine-server/minecraft-patches/features/0011-Old-zombie-reinforcement.patch b/lophine-server/minecraft-patches/features/0013-Old-zombie-reinforcement.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0011-Old-zombie-reinforcement.patch rename to lophine-server/minecraft-patches/features/0013-Old-zombie-reinforcement.patch diff --git a/lophine-server/minecraft-patches/features/0012-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0014-Spawn-invulnerable-time.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0012-Spawn-invulnerable-time.patch rename to lophine-server/minecraft-patches/features/0014-Spawn-invulnerable-time.patch diff --git a/lophine-server/minecraft-patches/features/0013-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0015-Leaves-Item-overstack-util.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0013-Leaves-Item-overstack-util.patch rename to lophine-server/minecraft-patches/features/0015-Leaves-Item-overstack-util.patch diff --git a/lophine-server/minecraft-patches/features/0015-Leaves-Old-raid-behavior.patch b/lophine-server/minecraft-patches/features/0016-Leaves-Old-raid-behavior.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0015-Leaves-Old-raid-behavior.patch rename to lophine-server/minecraft-patches/features/0016-Leaves-Old-raid-behavior.patch diff --git a/lophine-server/minecraft-patches/features/0016-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch b/lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0016-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch rename to lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch diff --git a/lophine-server/minecraft-patches/features/0017-Leaves-Leaves-Base-Protocol-Core.patch b/lophine-server/minecraft-patches/features/0018-Leaves-Leaves-Base-Protocol-Core.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0017-Leaves-Leaves-Base-Protocol-Core.patch rename to lophine-server/minecraft-patches/features/0018-Leaves-Leaves-Base-Protocol-Core.patch diff --git a/lophine-server/minecraft-patches/features/0018-Leaves-Configurable-trading-with-the-void.patch b/lophine-server/minecraft-patches/features/0019-Leaves-Configurable-trading-with-the-void.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0018-Leaves-Configurable-trading-with-the-void.patch rename to lophine-server/minecraft-patches/features/0019-Leaves-Configurable-trading-with-the-void.patch diff --git a/lophine-server/minecraft-patches/features/0019-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0020-Leaves-Servux-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0019-Leaves-Servux-Protocol.patch rename to lophine-server/minecraft-patches/features/0020-Leaves-Servux-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0020-LeavesHooks.patch b/lophine-server/minecraft-patches/features/0021-LeavesHooks.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0020-LeavesHooks.patch rename to lophine-server/minecraft-patches/features/0021-LeavesHooks.patch diff --git a/lophine-server/minecraft-patches/features/0021-Leaves-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0022-Leaves-Old-Explosion-Damage-Calculator.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0021-Leaves-Old-Explosion-Damage-Calculator.patch rename to lophine-server/minecraft-patches/features/0022-Leaves-Old-Explosion-Damage-Calculator.patch diff --git a/lophine-server/minecraft-patches/features/0022-Leaves-Redstone-Shears-Wrench.patch b/lophine-server/minecraft-patches/features/0023-Leaves-Redstone-Shears-Wrench.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0022-Leaves-Redstone-Shears-Wrench.patch rename to lophine-server/minecraft-patches/features/0023-Leaves-Redstone-Shears-Wrench.patch diff --git a/lophine-server/minecraft-patches/features/0023-Leaves-Syncmatica-Protocol.patch b/lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0023-Leaves-Syncmatica-Protocol.patch rename to lophine-server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0024-Leaves-BBOR-Protocol.patch b/lophine-server/minecraft-patches/features/0025-Leaves-BBOR-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0024-Leaves-BBOR-Protocol.patch rename to lophine-server/minecraft-patches/features/0025-Leaves-BBOR-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0025-Leaves-Xaero-Map-Protocol.patch b/lophine-server/minecraft-patches/features/0026-Leaves-Xaero-Map-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0025-Leaves-Xaero-Map-Protocol.patch rename to lophine-server/minecraft-patches/features/0026-Leaves-Xaero-Map-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0026-Leaves-Support-REI-protocol.patch b/lophine-server/minecraft-patches/features/0027-Leaves-Support-REI-protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0026-Leaves-Support-REI-protocol.patch rename to lophine-server/minecraft-patches/features/0027-Leaves-Support-REI-protocol.patch diff --git a/lophine-server/minecraft-patches/features/0027-Leaves-Jade-Protocol.patch b/lophine-server/minecraft-patches/features/0028-Leaves-Jade-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0027-Leaves-Jade-Protocol.patch rename to lophine-server/minecraft-patches/features/0028-Leaves-Jade-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0028-Leaves-Alternative-block-placement-Protocol.patch b/lophine-server/minecraft-patches/features/0029-Leaves-Alternative-block-placement-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0028-Leaves-Alternative-block-placement-Protocol.patch rename to lophine-server/minecraft-patches/features/0029-Leaves-Alternative-block-placement-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0029-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0030-Leaves-Fakeplayer.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0029-Leaves-Fakeplayer.patch rename to lophine-server/minecraft-patches/features/0030-Leaves-Fakeplayer.patch diff --git a/lophine-server/minecraft-patches/features/0030-Leaves-Replay-Mod-API.patch b/lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0030-Leaves-Replay-Mod-API.patch rename to lophine-server/minecraft-patches/features/0031-Leaves-Replay-Mod-API.patch diff --git a/lophine-server/minecraft-patches/features/0031-Leaves-Creative-fly-no-clip.patch b/lophine-server/minecraft-patches/features/0032-Leaves-Creative-fly-no-clip.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0031-Leaves-Creative-fly-no-clip.patch rename to lophine-server/minecraft-patches/features/0032-Leaves-Creative-fly-no-clip.patch diff --git a/lophine-server/minecraft-patches/features/0032-Leaves-Wool-Hopper-Counter.patch b/lophine-server/minecraft-patches/features/0033-Leaves-Wool-Hopper-Counter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0032-Leaves-Wool-Hopper-Counter.patch rename to lophine-server/minecraft-patches/features/0033-Leaves-Wool-Hopper-Counter.patch diff --git a/lophine-server/minecraft-patches/features/0033-Global-Entities-Counter.patch b/lophine-server/minecraft-patches/features/0034-Global-Entities-Counter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0033-Global-Entities-Counter.patch rename to lophine-server/minecraft-patches/features/0034-Global-Entities-Counter.patch diff --git a/lophine-server/minecraft-patches/features/0034-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0035-Leaves-Catch-update-suppression-crash.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0034-Leaves-Catch-update-suppression-crash.patch rename to lophine-server/minecraft-patches/features/0035-Leaves-Catch-update-suppression-crash.patch diff --git a/lophine-server/minecraft-patches/features/0035-Leaves-CCE-update-suppression.patch b/lophine-server/minecraft-patches/features/0036-Leaves-CCE-update-suppression.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0035-Leaves-CCE-update-suppression.patch rename to lophine-server/minecraft-patches/features/0036-Leaves-CCE-update-suppression.patch diff --git a/lophine-server/minecraft-patches/features/0036-Leaves-Redstone-ignore-upwards-update.patch b/lophine-server/minecraft-patches/features/0037-Leaves-Redstone-ignore-upwards-update.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0036-Leaves-Redstone-ignore-upwards-update.patch rename to lophine-server/minecraft-patches/features/0037-Leaves-Redstone-ignore-upwards-update.patch diff --git a/lophine-server/minecraft-patches/features/0037-Instant-Block-Updater.patch b/lophine-server/minecraft-patches/features/0038-Instant-Block-Updater.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0037-Instant-Block-Updater.patch rename to lophine-server/minecraft-patches/features/0038-Instant-Block-Updater.patch diff --git a/lophine-server/minecraft-patches/features/0038-Revert-TrapDoorBlock-changes-form-Paper.patch b/lophine-server/minecraft-patches/features/0039-Revert-TrapDoorBlock-changes-form-Paper.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0038-Revert-TrapDoorBlock-changes-form-Paper.patch rename to lophine-server/minecraft-patches/features/0039-Revert-TrapDoorBlock-changes-form-Paper.patch diff --git a/lophine-server/minecraft-patches/features/0039-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch b/lophine-server/minecraft-patches/features/0040-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0039-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch rename to lophine-server/minecraft-patches/features/0040-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch diff --git a/lophine-server/minecraft-patches/features/0040-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch b/lophine-server/minecraft-patches/features/0041-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0040-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch rename to lophine-server/minecraft-patches/features/0041-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch diff --git a/lophine-server/minecraft-patches/features/0041-Leaves-Old-Block-remove-behaviour.patch b/lophine-server/minecraft-patches/features/0042-Leaves-Old-Block-remove-behaviour.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0041-Leaves-Old-Block-remove-behaviour.patch rename to lophine-server/minecraft-patches/features/0042-Leaves-Old-Block-remove-behaviour.patch diff --git a/lophine-server/minecraft-patches/features/0042-Carpet-features.patch b/lophine-server/minecraft-patches/features/0043-Carpet-features.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0042-Carpet-features.patch rename to lophine-server/minecraft-patches/features/0043-Carpet-features.patch diff --git a/lophine-server/minecraft-patches/features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch b/lophine-server/minecraft-patches/features/0044-MiniTweaks-mob-fire-and-explosion-rules.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0043-MiniTweaks-mob-fire-and-explosion-rules.patch rename to lophine-server/minecraft-patches/features/0044-MiniTweaks-mob-fire-and-explosion-rules.patch diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java index 6618653..b71f4b0 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java @@ -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""")