Push forward

This commit is contained in:
2026-07-14 12:22:17 +08:00
parent 576a9a44c8
commit 969cd5c5f8
135 changed files with 551 additions and 551 deletions
@@ -14,7 +14,7 @@ index aa575f3b76ef70ffb9f0410e7e5cfe7af384bfbd..a00b086962b68d6f86cfb55eee6f61af
private void globalTick(final long tickCount) {
++this.tickCount;
+ // Shiroha start - Add a config to enable tick command
+ if (moe.monnairealms.camellia.config.modules.experiment.CommandConfig.tick) {
+ if (io.nanachiyo0721.shiroha.config.modules.experiment.CommandConfig.tick) {
+ MinecraftServer.getServer().tickRateManager().tick();
+ }
+ // Shiroha end - Add a config to enable tick command
@@ -26,7 +26,7 @@ index aa575f3b76ef70ffb9f0410e7e5cfe7af384bfbd..a00b086962b68d6f86cfb55eee6f61af
private void tickTime(final ServerLevel world, final long tickCount) {
- if (world.tickTime) {
+ if ((!moe.monnairealms.camellia.config.modules.experiment.CommandConfig.tick || world.tickRateManager().runsNormally()) && world.tickTime) { // Shiroha - Add a config to enable tick command
+ if ((!io.nanachiyo0721.shiroha.config.modules.experiment.CommandConfig.tick || world.tickRateManager().runsNormally()) && world.tickTime) { // Shiroha - Add a config to enable tick command
world.serverLevelData.setGameTime(world.serverLevelData.getGameTime() + tickCount);
}
}
@@ -39,7 +39,7 @@ index 913161732b0affa70fb114dd4087a6102b611cba..ccd86db7b384d99d290869a155792b49
// next start isn't updated until the end of this tick
this.tickRegion(tickCount, tickStart, scheduledEnd);
+ // Shiroha start - Add a config to enable tick command
+ if (moe.monnairealms.camellia.config.modules.experiment.CommandConfig.tick) {
+ if (io.nanachiyo0721.shiroha.config.modules.experiment.CommandConfig.tick) {
+ MinecraftServer.getServer().tickRateManager().endTickWork();
+ }
+ // Shiroha end - Add a config to enable tick command
@@ -56,7 +56,7 @@ index 6b91eab354d8e7c93bf148bfc1f5a611f8ffcf86..d971cc9669aca1005c026133e7e7e7f9
//TestCommand.register(this.dispatcher, context); // Folia - region threading
- //TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
+ // Shiroha start - Add a config to enable tick command
+ if (moe.monnairealms.camellia.config.modules.experiment.CommandConfig.tick) {
+ if (io.nanachiyo0721.shiroha.config.modules.experiment.CommandConfig.tick) {
+ TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
+ }
+ // Shiroha end - Add a config to enable tick command