Update Luminol

gradle.properties

@@ -4,7 +4,7 @@ mcVersion=1.21.8
 release=2
 # 0 for skip release, 1 for pre-release, 2 for release
 
-luminolRef=432fe842d34b18fc29e39c6bd94f07e68785a3bb
+luminolRef=9c79e227fcbb2bdfa624e97f522ca36aa4901100
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

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 <suisuroru@blue-millennium.fun>
+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);

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

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

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 <suisuroru@blue-millennium.fun>
 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

lophine-server/minecraft-patches/features/0011-Leaves-Base-Protocol-Core.patch

@@ -8,14 +8,14 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc1
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
-index 8405157ec35a443e238fa6866772c839621d73d7..a261f66c29412039bbbaed4758bcade2e076da56 100644
+index 8405157ec35a443e238fa6866772c839621d73d7..67f3454e6479abb241a7d94699d4f7bec22da56b 100644
 --- a/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/io/papermc/paper/threadedregions/RegionizedServer.java
 @@ -334,6 +334,8 @@ public final class RegionizedServer {
          }
          // Luminol end - Add a config to enable tick command
  
-+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(tickCount); // Leaves - protocol
++        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
 +
          // tick connections
          this.tickConnections();

lophine-server/paper-patches/features/0004-Leaves-Leaves-Fakeplayer.patch

@@ -8,19 +8,13 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index 9180f23529a31b6b0a5b38bb7cda3e32d487f691..cc8686b791f4c559e51bb06b52b02e295b6e0547 100644
+index 9180f23529a31b6b0a5b38bb7cda3e32d487f691..e1f456b31ffda9370b63e51f343847d6f9f62263 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-@@ -47,6 +47,23 @@ class PaperEventManager {
-             throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
-         }
+@@ -36,6 +36,15 @@ class PaperEventManager {
  
-+        // Leaves start - skip bot
-+        if (event instanceof org.bukkit.event.player.PlayerEvent playerEvent && playerEvent.getPlayer() instanceof org.leavesmc.leaves.entity.bot.Bot) {
-+            return;
-+        }
-+        // Leaves end - skip bot
-+
+     // SimplePluginManager
+     public void callEvent(@NotNull Event event) {
 +        // Leaves start - process bot load/save
 +        if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable && fun.bm.lophine.config.modules.function.FakeplayerConfig.canResident) {
 +            if (event instanceof org.bukkit.event.world.WorldLoadEvent worldLoadEvent) {
@@ -30,7 +24,18 @@ index 9180f23529a31b6b0a5b38bb7cda3e32d487f691..cc8686b791f4c559e51bb06b52b02e29
 +            }
 +        }
 +        // Leaves end - process bot load/save
-+
+         // Leaf start - Skip event if no listeners
+         RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
+         if (listeners.length == 0) return;
+@@ -47,6 +56,12 @@ class PaperEventManager {
+             throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
+         }
+ 
++        // Leaves start - skip bot
++        if (event instanceof org.bukkit.event.player.PlayerEvent playerEvent && playerEvent.getPlayer() instanceof org.leavesmc.leaves.entity.bot.Bot) {
++            return;
++        }
++        // Leaves end - skip bot
 +
          for (RegisteredListener registration : listeners) {
              if (!registration.getPlugin().isEnabled()) {

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;
 }

lophine-server/src/main/java/org/leavesmc/leaves/bot/BotList.java

@@ -172,30 +172,36 @@ public class BotList {
         this.botsByUUID.put(bot.getUUID(), bot);
 
         bot.supressTrackerForLogin = true;
-        world.addNewPlayer(bot);
+
+        io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                world, net.minecraft.util.Mth.floor(location.getX()) >> 4, net.minecraft.util.Mth.floor(location.getZ()) >> 4,
+                () -> {
+                    world.addNewPlayer(bot);
+
+                    BotJoinEvent event1 = new BotJoinEvent(bot.getBukkitEntity(), PaperAdventure.asAdventure(Component.translatable("multiplayer.player.joined", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)));
+                    this.server.server.getPluginManager().callEvent(event1);
+
+                    net.kyori.adventure.text.Component joinMessage = event1.joinMessage();
+                    if (joinMessage != null && !joinMessage.equals(net.kyori.adventure.text.Component.empty())) {
+                        this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(joinMessage), false);
+                    }
+
+                    bot.renderInfo();
+                    bot.supressTrackerForLogin = false;
+
+                    bot.level().getChunkSource().chunkMap.addEntity(bot);
+                    bot.renderData();
+                    bot.initInventoryMenu();
+                    botsNameByWorldUuid
+                            .computeIfAbsent(bot.level().uuid.toString(), (k) -> new HashSet<>())
+                            .add(bot.getBukkitEntity().getRealName());
+                    BotList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", bot.getName().getString(), "Local", bot.getId(), bot.level().serverLevelData.getLevelName(), bot.getX(), bot.getY(), bot.getZ());
+                },
+                ca.spottedleaf.concurrentutil.util.Priority.HIGHER);
         optional.ifPresent(nbt -> {
             bot.loadAndSpawnEnderPearls(nbt);
             bot.loadAndSpawnParentVehicle(nbt);
         });
-
-        BotJoinEvent event1 = new BotJoinEvent(bot.getBukkitEntity(), PaperAdventure.asAdventure(Component.translatable("multiplayer.player.joined", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)));
-        this.server.server.getPluginManager().callEvent(event1);
-
-        net.kyori.adventure.text.Component joinMessage = event1.joinMessage();
-        if (joinMessage != null && !joinMessage.equals(net.kyori.adventure.text.Component.empty())) {
-            this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(joinMessage), false);
-        }
-
-        bot.renderInfo();
-        bot.supressTrackerForLogin = false;
-
-        bot.level().getChunkSource().chunkMap.addEntity(bot);
-        bot.renderData();
-        bot.initInventoryMenu();
-        botsNameByWorldUuid
-                .computeIfAbsent(bot.level().uuid.toString(), (k) -> new HashSet<>())
-                .add(bot.getBukkitEntity().getRealName());
-        BotList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", bot.getName().getString(), "Local", bot.getId(), bot.level().serverLevelData.getLevelName(), bot.getX(), bot.getY(), bot.getZ());
         return bot;
     }
 

lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java

@@ -20,9 +20,12 @@ package org.leavesmc.leaves.bot.agent.configs;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import fun.bm.lophine.config.modules.experiment.CommandConfig;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
+import me.earthme.luminol.utils.NullPlugin;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.waypoints.ServerWaypointManager;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.bot.ServerBot;
 import org.leavesmc.leaves.command.CommandContext;
 
 public class LocatorBarConfig extends AbstractBotConfig<Boolean, Boolean, LocatorBarConfig> {
@@ -40,12 +43,20 @@ public class LocatorBarConfig extends AbstractBotConfig<Boolean, Boolean, Locato
 
     @Override
     public void setValue(@NotNull Boolean value) throws IllegalArgumentException {
-        this.value = value;
-        ServerWaypointManager manager = this.bot.level().getWaypointManager();
-        if (value) {
-            manager.trackWaypoint(this.bot);
+        if (bot == null) {
+            Bukkit.getGlobalRegionScheduler().runDelayed(new NullPlugin(), (task) -> setValue(value), 20);
         } else {
-            manager.untrackWaypoint(this.bot);
+            setValue(value, this.bot);
+        }
+    }
+
+    public void setValue(@NotNull Boolean value, ServerBot bot) throws IllegalArgumentException {
+        this.value = value;
+        ServerWaypointManager manager = bot.level().getWaypointManager();
+        if (value) {
+            manager.trackWaypoint(bot);
+        } else {
+            manager.untrackWaypoint(bot);
         }
     }
 

lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java

@@ -20,7 +20,9 @@ package org.leavesmc.leaves.bot.agent.configs;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
+import me.earthme.luminol.utils.NullPlugin;
 import net.minecraft.nbt.CompoundTag;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import org.leavesmc.leaves.command.CommandContext;
 
@@ -66,6 +68,10 @@ public class SimulationDistanceConfig extends AbstractBotConfig<Integer, Integer
 
     @Override
     public void load(@NotNull CompoundTag nbt) {
-        this.setValue(nbt.getIntOr(getName(), FakeplayerConfig.getSimulationDistance(this.bot)));
+        if (this.bot == null) {
+            Bukkit.getGlobalRegionScheduler().runDelayed(new NullPlugin(), (task) -> load(nbt), 20);
+        } else {
+            this.setValue(nbt.getIntOr(getName(), FakeplayerConfig.getSimulationDistance(this.bot)));
+        }
     }
 }

lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java

@@ -19,8 +19,11 @@ package org.leavesmc.leaves.bot.agent.configs;
 
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
+import me.earthme.luminol.utils.NullPlugin;
 import net.minecraft.nbt.CompoundTag;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.bot.ServerBot;
 import org.leavesmc.leaves.command.CommandContext;
 
 public class SkipSleepConfig extends AbstractBotConfig<Boolean, Boolean, SkipSleepConfig> {
@@ -35,7 +38,15 @@ public class SkipSleepConfig extends AbstractBotConfig<Boolean, Boolean, SkipSle
     }
 
     @Override
-    public void setValue(Boolean value) throws IllegalArgumentException {
+    public void setValue(@NotNull Boolean value) throws IllegalArgumentException {
+        if (bot == null) {
+            Bukkit.getGlobalRegionScheduler().runDelayed(new NullPlugin(), (task) -> setValue(value), 20);
+        } else {
+            setValue(value, this.bot);
+        }
+    }
+
+    public void setValue(@NotNull Boolean value, ServerBot bot) throws IllegalArgumentException {
         bot.fauxSleeping = value;
     }
 

lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/TickTypeConfig.java

@@ -71,7 +71,7 @@ public class TickTypeConfig extends AbstractBotConfig<ServerBot.TickType, String
     @Override
     public void load(@NotNull CompoundTag nbt) {
         String raw = nbt.getStringOr(getName(), FakeplayerConfig.tickType.name());
-        this.setValue(switch (raw) {
+        this.setValue(switch (raw.toLowerCase()) {
             case "network" -> ServerBot.TickType.NETWORK;
             case "entity_list" -> ServerBot.TickType.ENTITY_LIST;
             default -> throw new IllegalStateException("Unexpected bot tick type value: " + raw);

lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/LeavesProtocolManager.java

@@ -24,6 +24,7 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import org.leavesmc.leaves.protocol.core.invoker.*;
 import org.slf4j.Logger;
@@ -251,9 +252,9 @@ public class LeavesProtocolManager {
         return false;
     }
 
-    public static void handleTick(long tickCount) {
+    public static void handleTick() {
         for (var tickerInfo : TICKERS) {
-            if (tickCount % tickerInfo.owner().tickerInterval(tickerInfo.handler().tickerId()) == 0) {
+            if (MinecraftServer.getServer().checkTickCount(tickerInfo.owner().tickerInterval(tickerInfo.handler().tickerId()))) {
                 tickerInfo.invoke();
             }
         }