diff --git a/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-scoreboard-command.patch b/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-scoreboard-command.patch new file mode 100644 index 0000000..d29dc29 --- /dev/null +++ b/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-scoreboard-command.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Helvetica Volubi +Date: Mon, 29 Sep 2025 22:56:03 +0800 +Subject: [PATCH] Add config to enable scoreboard command + + +diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java +index e0e9fcf3224f55f2ef31c8afca3154a5992f761b..6633af3cff77bcd4bcc591c032d647b7a850dced 100644 +--- a/net/minecraft/commands/Commands.java ++++ b/net/minecraft/commands/Commands.java +@@ -231,7 +231,11 @@ public class Commands { + //RotateCommand.register(this.dispatcher); // Folia - region threading - TODO later + SayCommand.register(this.dispatcher); + //ScheduleCommand.register(this.dispatcher); // Folia - region threading +- //ScoreboardCommand.register(this.dispatcher, context); // Folia - region threading ++ // Lophine start - Add a config to enable scoreboard command ++ if (fun.bm.lophine.config.modules.experiment.CommandConfig.scoreboard) { ++ ScoreboardCommand.register(this.dispatcher, context); // Folia - region threading ++ } ++ // Lophine start - Add a config to enable scoreboard command + SeedCommand.register(this.dispatcher, selection != Commands.CommandSelection.INTEGRATED); + VersionCommand.register(this.dispatcher, selection != Commands.CommandSelection.INTEGRATED); + SetBlockCommand.register(this.dispatcher, context); diff --git a/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-tick-command.patch b/lophine-server/minecraft-patches/features/0008-Add-config-to-enable-tick-command.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0007-Add-config-to-enable-tick-command.patch rename to lophine-server/minecraft-patches/features/0008-Add-config-to-enable-tick-command.patch index 71be8f6..a34b67c 100644 --- a/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-tick-command.patch +++ b/lophine-server/minecraft-patches/features/0008-Add-config-to-enable-tick-command.patch @@ -97,10 +97,10 @@ index c485d5b3ba95f2a969bdf0dab9654ac284976f8d..b957585cf7cf7f845e20f59c7b355722 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 e0e9fcf3224f55f2ef31c8afca3154a5992f761b..a5b59eb79c014ef7a48ff305ed554fc33a184d87 100644 +index 6633af3cff77bcd4bcc591c032d647b7a850dced..dc5a558c72a5a7ab8a650262c6a1a2dc5142b8fc 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java -@@ -247,7 +247,11 @@ public class Commands { +@@ -251,7 +251,11 @@ public class Commands { TeleportCommand.register(this.dispatcher); TellRawCommand.register(this.dispatcher, context); //TestCommand.register(this.dispatcher, context); // Folia - region threading diff --git a/lophine-server/minecraft-patches/features/0008-Add-config-to-enable-waypoint-command-bar.patch b/lophine-server/minecraft-patches/features/0009-Add-config-to-enable-waypoint-command-bar.patch similarity index 96% rename from lophine-server/minecraft-patches/features/0008-Add-config-to-enable-waypoint-command-bar.patch rename to lophine-server/minecraft-patches/features/0009-Add-config-to-enable-waypoint-command-bar.patch index 917227d..947f413 100644 --- a/lophine-server/minecraft-patches/features/0008-Add-config-to-enable-waypoint-command-bar.patch +++ b/lophine-server/minecraft-patches/features/0009-Add-config-to-enable-waypoint-command-bar.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add config to enable waypoint command & bar diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index a5b59eb79c014ef7a48ff305ed554fc33a184d87..e8c7cc10f10fc013100fa66f3489ac98b3a29227 100644 +index dc5a558c72a5a7ab8a650262c6a1a2dc5142b8fc..9eee09ecc18abcc5972f65938ba8607dfeede026 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java -@@ -255,7 +255,11 @@ public class Commands { +@@ -259,7 +259,11 @@ public class Commands { TimeCommand.register(this.dispatcher); TitleCommand.register(this.dispatcher, context); //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later diff --git a/lophine-server/minecraft-patches/features/0009-Re-add-tick-count-support.patch b/lophine-server/minecraft-patches/features/0010-Rewrite-tickCount-support.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0009-Re-add-tick-count-support.patch rename to lophine-server/minecraft-patches/features/0010-Rewrite-tickCount-support.patch index b304d1f..39ff89b 100644 --- a/lophine-server/minecraft-patches/features/0009-Re-add-tick-count-support.patch +++ b/lophine-server/minecraft-patches/features/0010-Rewrite-tickCount-support.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Sun, 28 Sep 2025 13:21:30 +0800 -Subject: [PATCH] Re-add tick count support +Subject: [PATCH] Rewrite tickCount support diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java diff --git a/lophine-server/minecraft-patches/features/0010-Leaves-Base-Protocol-Core.patch b/lophine-server/minecraft-patches/features/0011-Leaves-Base-Protocol-Core.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0010-Leaves-Base-Protocol-Core.patch rename to lophine-server/minecraft-patches/features/0011-Leaves-Base-Protocol-Core.patch diff --git a/lophine-server/minecraft-patches/features/0011-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0012-Leaves-Item-overstack-util.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0011-Leaves-Item-overstack-util.patch rename to lophine-server/minecraft-patches/features/0012-Leaves-Item-overstack-util.patch diff --git a/lophine-server/minecraft-patches/features/0012-Leaves-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0013-Leaves-Old-Explosion-Damage-Calculator.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0012-Leaves-Old-Explosion-Damage-Calculator.patch rename to lophine-server/minecraft-patches/features/0013-Leaves-Old-Explosion-Damage-Calculator.patch diff --git a/lophine-server/minecraft-patches/features/0013-Leaves-Old-raid-behavior.patch b/lophine-server/minecraft-patches/features/0014-Leaves-Old-raid-behavior.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0013-Leaves-Old-raid-behavior.patch rename to lophine-server/minecraft-patches/features/0014-Leaves-Old-raid-behavior.patch diff --git a/lophine-server/minecraft-patches/features/0014-Leaves-Redstone-Shears-Wrench.patch b/lophine-server/minecraft-patches/features/0015-Leaves-Redstone-Shears-Wrench.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0014-Leaves-Redstone-Shears-Wrench.patch rename to lophine-server/minecraft-patches/features/0015-Leaves-Redstone-Shears-Wrench.patch diff --git a/lophine-server/minecraft-patches/features/0015-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0016-Leaves-Servux-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0015-Leaves-Servux-Protocol.patch rename to lophine-server/minecraft-patches/features/0016-Leaves-Servux-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0016-Purpur-Barrels-and-enderchests-6-rows.patch b/lophine-server/minecraft-patches/features/0017-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0016-Purpur-Barrels-and-enderchests-6-rows.patch rename to lophine-server/minecraft-patches/features/0017-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch b/lophine-server/minecraft-patches/features/0018-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0017-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch rename to lophine-server/minecraft-patches/features/0018-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch diff --git a/lophine-server/minecraft-patches/features/0018-Disable-some-check-for-operators.patch b/lophine-server/minecraft-patches/features/0019-Disable-some-check-for-operators.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0018-Disable-some-check-for-operators.patch rename to lophine-server/minecraft-patches/features/0019-Disable-some-check-for-operators.patch diff --git a/lophine-server/minecraft-patches/features/0019-I18n-support.patch b/lophine-server/minecraft-patches/features/0020-I18n-support.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0019-I18n-support.patch rename to lophine-server/minecraft-patches/features/0020-I18n-support.patch diff --git a/lophine-server/minecraft-patches/features/0020-Old-zombie-reinforcement.patch b/lophine-server/minecraft-patches/features/0021-Old-zombie-reinforcement.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0020-Old-zombie-reinforcement.patch rename to lophine-server/minecraft-patches/features/0021-Old-zombie-reinforcement.patch diff --git a/lophine-server/minecraft-patches/features/0021-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0022-Spawn-invulnerable-time.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0021-Spawn-invulnerable-time.patch rename to lophine-server/minecraft-patches/features/0022-Spawn-invulnerable-time.patch diff --git a/lophine-server/minecraft-patches/features/0022-Leaves-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0023-Leaves-Leaves-Fakeplayer.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0022-Leaves-Leaves-Fakeplayer.patch rename to lophine-server/minecraft-patches/features/0023-Leaves-Leaves-Fakeplayer.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 0ca1caa..2edaf48 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 @@ -26,8 +26,13 @@ public class CommandConfig implements IConfigModule { @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint bar"}) @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint_bar"}) - @ConfigInfo(name = "waypoint_command_enabled", comments = """ - Allow to use waypoint command - """) + @ConfigInfo(name = "waypoint_command_enabled", comments = + """ + Allow to use waypoint command""") public static boolean waypoint = false; + + @ConfigInfo(name = "scoreboard_command_enabled", comments = + """ + Allow to use scoreboard command""") + public static boolean scoreboard = false; } \ No newline at end of file