Remove experimental per-chunk zeroing engine from develop (#448)

The lazy-zero / per-chunk handicap / parallel chunk scan work merged via
PRs #435 and #440 (plus follow-up fixes) is not production-ready: admins
running CI snapshot builds saw established island levels reset and
recalculations that only counted newly placed blocks (#448).

That work now continues on the feat/per-chunk-zeroing branch. This
commit restores the stable 2.27.0 calculation engine on develop while
keeping everything safe that landed since 2.27.0:

- Donation fixes: recalc donated points from donatedBlocks (#438),
  enforce blockconfig donation limits in GUI/prompts (#439), cap
  donated counts to current block limits (#443)
- MockBukkit pinned to Maven Central 4.110.0
- Modrinth MC 26.1.2 game version (#444)
- CI publish workflow changes (#445, #446, #447)
- Version stays 2.28.0-SNAPSHOT

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Y6f59pxCkwS8QXtJSe1nq6

Author: tastybento

src/main/java/world/bentobox/level/Level.java

@@ -46,7 +46,6 @@
 import world.bentobox.level.listeners.IslandActivitiesListeners;
 import world.bentobox.level.listeners.JoinLeaveListener;
 import world.bentobox.level.listeners.MigrationListener;
-import world.bentobox.level.listeners.NewChunkListener;
 import world.bentobox.level.requests.LevelRequestHandler;
 import world.bentobox.level.requests.TopTenRequestHandler;
 import world.bentobox.visit.VisitAddon;
@@ -155,10 +154,6 @@ private void registerAllListeners() {
         registerListener(new IslandActivitiesListeners(this));
         registerListener(new JoinLeaveListener(this));
         registerListener(new MigrationListener(this));
-        // Accumulates generator block points into initialCount as new chunks
-        // are generated, so large protection ranges work with zero-new-island
-        // mode without forcing the initial scan to generate the whole area.
-        registerListener(new NewChunkListener(this));
     }
 
     private void registerGameModeCommands() {

src/main/java/world/bentobox/level/LevelsManager.java

@@ -7,7 +7,6 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.scheduler.BukkitTask;
 
 import world.bentobox.bentobox.BentoBox;
@@ -50,7 +49,7 @@ public Pipeliner(Level addon) {
                 // Ignore deleted or unowned islands
                 if (!iD.getIsland().isDeleted() && !iD.getIsland().isUnowned()) {
                     inProcessQueue.put(iD, System.currentTimeMillis());
-                    BentoBox.getInstance().log("Starting to scan island level at " + formatCenter(iD.getIsland().getCenter()));
+                    BentoBox.getInstance().log("Starting to scan island level at " + iD.getIsland().getCenter());
                     // Start the scanning of a island with the first chunk
                     scanIsland(iD);
                 }
@@ -97,34 +96,17 @@ public CompletableFuture<Results> addIsland(Island island) {
                 .map(IslandLevelCalculator::getIsland).anyMatch(island::equals)) {
             return CompletableFuture.completedFuture(new Results(Result.IN_PROGRESS));
         }
-        BentoBox.getInstance().log("Added island to Level queue: " + formatCenter(island.getCenter()));
+        BentoBox.getInstance().log("Added island to Level queue: " + island.getCenter());
         return addToQueue(island, false);
     }
 
-    /**
-     * Render an island centre as "<world_name> x,y,z" for log lines instead of
-     * Bukkit's verbose Location.toString().
-     */
-    static String formatCenter(Location loc) {
-        if (loc == null) {
-            return "?";
-        }
-        String worldName = loc.getWorld() == null ? "?" : loc.getWorld().getName();
-        return worldName + " " + loc.getBlockX() + "," + loc.getBlockY() + "," + loc.getBlockZ();
-    }
-
     /**
      * Adds an island to the scanning queue
      * @param island  - the island to scan
      * @return CompletableFuture of the results
      */
     public CompletableFuture<Results> zeroIsland(Island island) {
-        BentoBox.getInstance().log("Zeroing island level for island at " + formatCenter(island.getCenter()));
-        // Begin tracking listener events during the scan so chunks that
-        // generate after the scan polls their position (and are therefore
-        // missed by the scan) keep their listener-credited handicap instead
-        // of being wiped by the post-scan baseline reset.
-        addon.getManager().beginZeroScan(island);
+        BentoBox.getInstance().log("Zeroing island level for island at " + island.getCenter());
         return addToQueue(island, true);
     }
 
@@ -165,17 +147,10 @@ public void stop() {
     /**
      * @return the inProcessQueue
      */
-    public Map<IslandLevelCalculator, Long> getInProcessQueue() {
+    protected Map<IslandLevelCalculator, Long> getInProcessQueue() {
         return inProcessQueue;
     }
 
-    /**
-     * @return the queue of islands waiting to start scanning
-     */
-    public Queue<IslandLevelCalculator> getToProcessQueue() {
-        return toProcessQueue;
-    }
-
     /**
      * @return the task
      */

src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java

@@ -1,15 +1,11 @@
 package world.bentobox.level.commands;
 
 import java.util.List;
-import java.util.Map;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bentobox.util.Util;
 import world.bentobox.level.Level;
-import world.bentobox.level.calculators.IslandLevelCalculator;
 
 public class AdminLevelStatusCommand extends CompositeCommand {
 
@@ -29,59 +25,7 @@ public void setup() {
 
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        int total = addon.getPipeliner().getIslandsInQueue();
-        user.sendMessage("admin.levelstatus.islands-in-queue", TextVariables.NUMBER, String.valueOf(total));
-        long now = System.currentTimeMillis();
-        Map<IslandLevelCalculator, Long> inProcess = addon.getPipeliner().getInProcessQueue();
-        inProcess.forEach((calc, started) -> {
-            user.sendMessage(buildDetailKey(calc),
-                    "[world]", worldName(calc),
-                    "[xyz]", xyz(calc),
-                    "[type]", typeKey(user, calc),
-                    "[elapsed]", formatElapsed(now - started),
-                    "[scanned]", String.valueOf(calc.getScannedChunks()),
-                    "[total]", String.valueOf(calc.getTotalChunksToScan()));
-            int pending = addon.getManager().getPendingZeroCount(calc.getIsland());
-            if (pending > 0) {
-                user.sendMessage("admin.levelstatus.pending-zeros",
-                        TextVariables.NUMBER, String.valueOf(pending));
-            }
-        });
-        for (IslandLevelCalculator calc : addon.getPipeliner().getToProcessQueue()) {
-            user.sendMessage("admin.levelstatus.island-queued",
-                    "[world]", worldName(calc),
-                    "[xyz]", xyz(calc),
-                    "[type]", typeKey(user, calc));
-        }
+        user.sendMessage("admin.levelstatus.islands-in-queue", TextVariables.NUMBER, String.valueOf(addon.getPipeliner().getIslandsInQueue()));
         return true;
     }
-
-    private String buildDetailKey(IslandLevelCalculator calc) {
-        return "admin.levelstatus.island-detail";
-    }
-
-    private String worldName(IslandLevelCalculator calc) {
-        Island island = calc.getIsland();
-        return island.getWorld() == null ? "?" : island.getWorld().getName();
-    }
-
-    private String xyz(IslandLevelCalculator calc) {
-        Island island = calc.getIsland();
-        if (island.getCenter() == null) {
-            return "?";
-        }
-        return Util.xyz(island.getCenter().toVector());
-    }
-
-    private String typeKey(User user, IslandLevelCalculator calc) {
-        return user.getTranslation(calc.isZeroIsland()
-                ? "admin.levelstatus.type-zero" : "admin.levelstatus.type-regular");
-    }
-
-    private String formatElapsed(long ms) {
-        long s = Math.max(0, ms / 1000);
-        long m = s / 60;
-        s = s % 60;
-        return m > 0 ? (m + "m" + s + "s") : (s + "s");
-    }
 }

src/main/java/world/bentobox/level/calculators/Pipeliner.java

@@ -54,23 +54,6 @@ public class ConfigSettings implements ConfigObject {
     @ConfigEntry(path = "zero-new-island-levels")
     private boolean zeroNewIslandLevels = true;
 
-    @ConfigComment("")
-    @ConfigComment("Delay (in ticks) between a chunk being freshly generated and that chunk")
-    @ConfigComment("being scanned for the lazy-zero handicap. The delay lets neighbouring")
-    @ConfigComment("chunks finish their decoration phase (obsidian from lava-water, ore")
-    @ConfigComment("patches that spill across borders, broken nether portal spawns, etc.)")
-    @ConfigComment("so the captured snapshot matches what a regular level scan would later")
-    @ConfigComment("find. The level scan also waits for any in-flight delayed captures to")
-    @ConfigComment("complete before returning the result, so the handicap is always up to")
-    @ConfigComment("date with the chunks that have generated. 20 ticks = 1 second.")
-    @ConfigComment("Underwater obsidian on AcidIsland needs lava sources to flow into")
-    @ConfigComment("adjacent water before they convert — that can take 20-30 seconds, so")
-    @ConfigComment("the default is set high enough to catch it. Lower if you don't care")
-    @ConfigComment("about slow-forming terrain and want /level to settle faster after a")
-    @ConfigComment("burst of exploration.")
-    @ConfigEntry(path = "zero-scan-delay-ticks")
-    private int zeroScanDelayTicks = 600;
-
     @ConfigComment("")
     @ConfigComment("Donations-only mode")
     @ConfigComment("If true, the island block scan is skipped entirely and the island level")
@@ -414,20 +397,6 @@ public void setZeroNewIslandLevels(boolean zeroNewIslandLevels) {
         this.zeroNewIslandLevels = zeroNewIslandLevels;
     }
 
-    /**
-     * @return the zeroScanDelayTicks
-     */
-    public int getZeroScanDelayTicks() {
-        return zeroScanDelayTicks;
-    }
-
-    /**
-     * @param zeroScanDelayTicks the zeroScanDelayTicks to set
-     */
-    public void setZeroScanDelayTicks(int zeroScanDelayTicks) {
-        this.zeroScanDelayTicks = zeroScanDelayTicks;
-    }
-
 
     /**
      * @return the calculationTimeout

src/main/java/world/bentobox/level/commands/AdminLevelStatusCommand.java

@@ -41,15 +41,8 @@ public IslandActivitiesListeners(Level addon) {
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onNewIsland(IslandCreatedEvent e) {
         if (addon.getSettings().isZeroNewIslandLevels()) {
-            // Delay the zero scan so decoration (fluid simulation,
-            // late-arriving obsidian/portal frames, trial-spawner setup,
-            // chunk-border ore patches) has time to settle before we
-            // snapshot the baseline. Reuses the listener's decoration-settle
-            // setting (zero-scan-delay-ticks, default 600 = 30s) so both
-            // paths honour the same "give the world a chance to finish
-            // generating" window.
-            long delay = Math.max(150L, addon.getSettings().getZeroScanDelayTicks());
-            Bukkit.getScheduler().runTaskLater(addon.getPlugin(), () -> zeroIsland(e.getIsland()), delay);
+            // Wait a few seconds before performing the zero
+            Bukkit.getScheduler().runTaskLater(addon.getPlugin(), () -> zeroIsland(e.getIsland()), 150L);
         }
     }
 
@@ -64,33 +57,7 @@ private void zeroIsland(final Island island) {
         // Clear the island setting
         if (island.getOwner() != null && island.getWorld() != null) {
             addon.getPipeliner().zeroIsland(island)
-                    .thenAccept(results -> {
-                        if (results == null) {
-                            // Scan was aborted (island deleted/unowned mid-flight).
-                            // Drop the tracking maps so the next zero scan
-                            // for this island starts clean.
-                            addon.getManager().drainZeroScanDeferred(island);
-                            return;
-                        }
-                        // Hard reset the baseline. The calculator already
-                        // overwrote the per-chunk handicap map with the
-                        // scanned values via reconcileHandicapChunks(...,
-                        // zeroScan=true) inside tidyUp; this aligns the
-                        // initialCount with that same baseline.
-                        addon.getManager().setInitialIslandCount(island, results.getTotalPoints());
-                        // Fold in any listener credits captured during the
-                        // scan for chunks the scan didn't visit (e.g.
-                        // chunks generated mid-scan after their position
-                        // was already polled). Reconciling these as a
-                        // non-zero scan adds them to both the per-chunk
-                        // map and the initialCount in one atomic write,
-                        // so subsequent scans see those chunks as fully
-                        // accounted for.
-                        java.util.Map<String, Long> missed = addon.getManager().drainZeroScanDeferred(island);
-                        if (!missed.isEmpty()) {
-                            addon.getManager().reconcileHandicapChunks(island, missed, false);
-                        }
-                    });
+                    .thenAccept(results -> addon.getManager().setInitialIslandCount(island, results.getTotalPoints()));
         }
     }