Address code review feedback: improve code quality and reduce duplication

Co-authored-by: modpotato <81768237+modpotato@users.noreply.github.com>

Author: Copilot

src/main/java/top/modpotato/restoration/RestorationProgressTracker.java

@@ -21,6 +21,7 @@ public class RestorationProgressTracker {
     private final Map<UUID, Integer> lastPercentUpdate; // sessionId -> last percent milestone
     private final Set<UUID> globalOptOut; // Players who opted out of ALL feedback
     private Object taskId = null; // Can be Integer (Paper) or ScheduledTask (Folia)
+    private boolean isFolia; // Cache the Folia check result
 
     // Configuration
     private static final long TIME_UPDATE_INTERVAL_MS = 60000; // 60 seconds
@@ -38,6 +39,7 @@ public RestorationProgressTracker(Main plugin) {
         this.lastTimeUpdate = new ConcurrentHashMap<>();
         this.lastPercentUpdate = new ConcurrentHashMap<>();
         this.globalOptOut = ConcurrentHashMap.newKeySet();
+        this.isFolia = checkFolia();
     }
 
     /**
@@ -48,9 +50,6 @@ public void start() {
             return; // Already running
         }
 
-        // Check if running on Folia
-        boolean isFolia = checkFolia();
-        
         if (isFolia) {
             // On Folia, use global region scheduler (runs every second = 20 ticks)
             taskId = Bukkit.getGlobalRegionScheduler().runAtFixedRate(plugin, task -> {
@@ -70,12 +69,11 @@ public void stop() {
             return; // Not running
         }
 
-        boolean isFolia = checkFolia();
-        
         if (isFolia) {
             // On Folia, cancel the ScheduledTask
+            // The ScheduledTask interface has a cancel() method
             try {
-                // taskId is a ScheduledTask, call cancel() on it
+                // Use reflection only as fallback for API compatibility
                 taskId.getClass().getMethod("cancel").invoke(taskId);
             } catch (Exception e) {
                 plugin.getLogger().warning("Failed to cancel Folia task: " + e.getMessage());

src/main/java/top/modpotato/util/DebrisStorage.java

@@ -529,7 +529,7 @@ public RestorationSession scheduleRestoreAll(CommandSender initiator) {
                 for (String locString : entry.getValue()) {
                     try {
                         Location loc = deserializeLocation(world, locString);
-                        uniqueChunks.add(world.getUID() + ":" + (loc.getBlockX() >> 4) + "," + (loc.getBlockZ() >> 4));
+                        uniqueChunks.add(getChunkKey(loc, true));
                     } catch (Exception e) {
                         // Ignore invalid locations
                     }
@@ -571,7 +571,7 @@ public RestorationSession scheduleRestoreInWorld(CommandSender initiator, World
         for (String locString : locations) {
             try {
                 Location loc = deserializeLocation(world, locString);
-                uniqueChunks.add((loc.getBlockX() >> 4) + "," + (loc.getBlockZ() >> 4));
+                uniqueChunks.add(getChunkKey(loc, false));
             } catch (Exception e) {
                 // Ignore invalid locations
             }
@@ -911,4 +911,19 @@ private boolean checkFolia() {
             return false;
         }
     }
+    
+    /**
+     * Generates a chunk key for a location
+     * @param location The location
+     * @param includeWorld Whether to include the world UUID in the key
+     * @return The chunk key
+     */
+    private String getChunkKey(Location location, boolean includeWorld) {
+        int chunkX = location.getBlockX() >> 4;
+        int chunkZ = location.getBlockZ() >> 4;
+        if (includeWorld && location.getWorld() != null) {
+            return location.getWorld().getUID() + ":" + chunkX + "," + chunkZ;
+        }
+        return chunkX + "," + chunkZ;
+    }
 } 

src/main/resources/plugin.yml

@@ -12,6 +12,7 @@ commands:
     usage: |
       /<command> reload - Reload the configuration
       /<command> restore-debris [world] - Restore all replaced Ancient Debris (optionally in a specific world)
+      /<command> restore-feedback <on|off> - Toggle restoration progress feedback
       /<command> debris-info - Show information about stored Ancient Debris locations
       /<command> get <setting> - Get a configuration value
       /<command> set <setting> <value> - Set a configuration value