feat(nav): ✨ Fully Reload BlueMap markers when smt changes + make it opt out

Zoriot · Zoriot · commit 11707a5c9d14 · 2026-02-15T23:39:30.000+01:00
Closes #74.
diff --git a/src/main/java/net/buildtheearth/buildteamtools/modules/navigation/NavigationModule.java b/src/main/java/net/buildtheearth/buildteamtools/modules/navigation/NavigationModule.java
@@ -1,6 +1,7 @@
 package net.buildtheearth.buildteamtools.modules.navigation;
 
 import lombok.Getter;
+import net.buildtheearth.buildteamtools.BuildTeamTools;
 import net.buildtheearth.buildteamtools.modules.Module;
 import net.buildtheearth.buildteamtools.modules.navigation.components.bluemap.BluemapComponent;
 import net.buildtheearth.buildteamtools.modules.navigation.components.navigator.NavigatorComponent;
@@ -17,6 +18,8 @@
 import net.buildtheearth.buildteamtools.modules.navigation.components.warps.listeners.WarpJoinListener;
 import net.buildtheearth.buildteamtools.modules.network.NetworkModule;
 import net.buildtheearth.buildteamtools.utils.WikiLinks;
+import net.buildtheearth.buildteamtools.utils.io.ConfigPaths;
+import net.buildtheearth.buildteamtools.utils.io.ConfigUtil;
 import org.bukkit.Bukkit;
 
 /**
@@ -56,7 +59,14 @@ public void enable() {
         warpsComponent = new WarpsComponent();
         navigatorComponent = new NavigatorComponent();
         tpllComponent = new TpllComponent();
-        if (Bukkit.getPluginManager().isPluginEnabled("BlueMap")) bluemapComponent = new BluemapComponent();
+
+        // Check if BlueMap plugin is enabled and config allows BlueMap integration
+        boolean bluemapConfigEnabled = BuildTeamTools.getInstance().getConfig(ConfigUtil.NAVIGATION)
+                .getBoolean(ConfigPaths.Navigation.BLUEMAP_ENABLED, true);
+
+        if (Bukkit.getPluginManager().isPluginEnabled("BlueMap") && bluemapConfigEnabled) {
+            bluemapComponent = new BluemapComponent();
+        }
 
         super.enable();
     }
diff --git a/src/main/java/net/buildtheearth/buildteamtools/modules/navigation/components/bluemap/BluemapComponent.java b/src/main/java/net/buildtheearth/buildteamtools/modules/navigation/components/bluemap/BluemapComponent.java
@@ -11,6 +11,8 @@
 import net.buildtheearth.buildteamtools.modules.navigation.components.warps.model.WarpGroup;
 import net.buildtheearth.buildteamtools.modules.network.NetworkModule;
 import net.buildtheearth.buildteamtools.utils.geo.CoordinateConversion;
+import net.buildtheearth.buildteamtools.utils.io.ConfigPaths;
+import net.buildtheearth.buildteamtools.utils.io.ConfigUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -34,20 +36,38 @@
  * If a world doesn't exist or isn't loaded in BlueMap, its warps are simply skipped without
  * causing errors.
  * </p>
+ * <p>
+ * This component can be disabled via configuration by setting {@code bluemap.enabled} to false
+ * in the navigation config. Live updates are supported - when warps or warp groups change,
+ * all markers are cleared and re-registered.
+ * </p>
  */
 public class BluemapComponent extends ModuleComponent {
 
     /**
      * Initializes the BlueMap component and registers warp markers.
      * <p>
-     * Checks if BlueMapAPI is available before proceeding. If not, the component is disabled.
-     * Once BlueMap is ready, all warp groups from the current BuildTeam are processed and
-     * their warps are registered as markers, organized by world.
+     * Checks if BlueMapAPI is available and if the component is enabled in config.
+     * If either check fails, the component is disabled. Once BlueMap is ready, all warp groups
+     * from the current BuildTeam are processed and their warps are registered as markers,
+     * organized by world.
      * </p>
      */
     public BluemapComponent() {
         super("BlueMap");
 
+        // Check if BlueMap integration is enabled in config
+        boolean isEnabled = BuildTeamTools.getInstance().getConfig(ConfigUtil.NAVIGATION)
+                .getBoolean(ConfigPaths.Navigation.BLUEMAP_ENABLED, true);
+
+        if (!isEnabled) {
+            BuildTeamTools.getInstance().getComponentLogger().info(
+                    Component.text("BlueMap integration is disabled in configuration.", NamedTextColor.YELLOW)
+            );
+            disable();
+            return;
+        }
+
         Optional<BlueMapAPI> optionalApi = BlueMapAPI.getInstance();
         if (optionalApi.isEmpty()) {
             disable();
@@ -57,8 +77,7 @@ public BluemapComponent() {
         BuildTeamTools.getInstance().getComponentLogger().info(Component.text("Loading BlueMap integration for WarpGroups & Warps...", NamedTextColor.GREEN));
 
         // Register marker loading when BlueMap is ready
-        BlueMapAPI.onEnable(api -> NetworkModule.getInstance().getBuildTeam().getWarpGroups()
-                .forEach(warpGroup -> registerWarpGroupMarkers(api, warpGroup)));
+        BlueMapAPI.onEnable(api -> refreshAllMarkers());
     }
 
     /**
@@ -137,4 +156,55 @@ private void addWarpMarker(@NotNull MarkerSet markerSet, @NotNull Warp warp) {
         // Add marker to the marker set
         markerSet.getMarkers().put(warp.getId().toString(), marker);
     }
+
+    /**
+     * Refreshes all BlueMap markers by clearing existing ones and re-registering all warp groups.
+     * <p>
+     * This method should be called whenever warps or warp groups are added, updated, or removed
+     * to ensure the BlueMap display stays in sync with the current state.
+     * </p>
+     */
+    public void refreshAllMarkers() {
+        if (!isEnabled()) {
+            return;
+        }
+
+        Optional<BlueMapAPI> optionalApi = BlueMapAPI.getInstance();
+        if (optionalApi.isEmpty()) {
+            return;
+        }
+
+        BlueMapAPI api = optionalApi.get();
+
+        // Clear all existing warp group markers
+        clearAllMarkers(api);
+
+        // Re-register all warp groups
+        NetworkModule.getInstance().getBuildTeam().getWarpGroups()
+                .forEach(warpGroup -> registerWarpGroupMarkers(api, warpGroup));
+
+        BuildTeamTools.getInstance().getComponentLogger().info(
+                Component.text("Refreshed BlueMap markers for all warp groups.", NamedTextColor.GREEN)
+        );
+    }
+
+    /**
+     * Clears all warp group markers from all BlueMap worlds.
+     * <p>
+     * This method iterates through all loaded worlds and removes all marker sets
+     * that were created by this component for warp groups.
+     * </p>
+     *
+     * @param api the BlueMapAPI instance
+     */
+    private void clearAllMarkers(@NotNull BlueMapAPI api) {
+        // Get all warp group IDs that need to be cleared
+        List<String> warpGroupIds = NetworkModule.getInstance().getBuildTeam().getWarpGroups()
+                .stream()
+                .map(warpGroup -> warpGroup.getId().toString())
+                .toList();
+
+        // Clear markers from all worlds
+        api.getWorlds().forEach(world -> world.getMaps().forEach(map -> warpGroupIds.forEach(id -> map.getMarkerSets().remove(id))));
+    }
 }
diff --git a/src/main/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeam.java b/src/main/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeam.java
@@ -2,6 +2,7 @@
 
 import com.alpsbte.alpslib.utils.ChatHelper;
 import lombok.Getter;
+import net.buildtheearth.buildteamtools.modules.navigation.NavigationModule;
 import net.buildtheearth.buildteamtools.modules.navigation.components.warps.model.Warp;
 import net.buildtheearth.buildteamtools.modules.navigation.components.warps.model.WarpGroup;
 import net.buildtheearth.buildteamtools.modules.network.NetworkModule;
@@ -70,9 +71,11 @@ public void createWarp(Player creator, Warp warp){
             @Override
             public void onResponse(String response) {
                 // Update the cache
-                NetworkModule.getInstance().updateCache().thenRun(() ->
-                        ChatHelper.sendSuccessfulMessage(creator, "Successfully created the warp %s!", warp.getName())
-                );
+                NetworkModule.getInstance().updateCache().thenRun(() -> {
+                    ChatHelper.sendSuccessfulMessage(creator, "Successfully created the warp %s!", warp.getName());
+                    // Refresh BlueMap markers
+                    refreshBluemapMarkers();
+                });
             }
 
             @Override
@@ -94,9 +97,11 @@ public void createWarpGroup(Player creator, WarpGroup warpGroup){
             @Override
             public void onResponse(String response) {
                 // Update the cache
-                NetworkModule.getInstance().updateCache().thenRun(() ->
-                        ChatHelper.sendSuccessfulMessage(creator, "Successfully created the warp group %s!", warpGroup.getName())
-                );
+                NetworkModule.getInstance().updateCache().thenRun(() -> {
+                    ChatHelper.sendSuccessfulMessage(creator, "Successfully created the warp group %s!", warpGroup.getName());
+                    // Refresh BlueMap markers
+                    refreshBluemapMarkers();
+                });
             }
 
             @Override
@@ -119,9 +124,11 @@ public void updateWarp(Player updater, Warp warp){
             @Override
             public void onResponse(String response) {
                 // Update the cache
-                NetworkModule.getInstance().updateCache().thenRun(() ->
-                        ChatHelper.sendSuccessfulMessage(updater, "Successfully updated the warp %s!", warp.getName())
-                ).exceptionally(e -> {
+                NetworkModule.getInstance().updateCache().thenRun(() -> {
+                    ChatHelper.sendSuccessfulMessage(updater, "Successfully updated the warp %s!", warp.getName());
+                    // Refresh BlueMap markers
+                    refreshBluemapMarkers();
+                }).exceptionally(e -> {
                     updater.sendMessage(ChatHelper.getErrorString("Something went wrong while updating the warp %s! Please take a look at the console.", warp.getName()));
                     e.printStackTrace();
                     return null;
@@ -147,9 +154,11 @@ public void updateWarpGroup(Player updater, WarpGroup warpGroup){
             @Override
             public void onResponse(String response) {
                 // Update the cache
-                NetworkModule.getInstance().updateCache().thenRun(() ->
-                        ChatHelper.sendSuccessfulMessage(updater, "Successfully updated the warp group %s!", warpGroup.getName())
-                ).exceptionally(e -> {
+                NetworkModule.getInstance().updateCache().thenRun(() -> {
+                    ChatHelper.sendSuccessfulMessage(updater, "Successfully updated the warp group %s!", warpGroup.getName());
+                    // Refresh BlueMap markers
+                    refreshBluemapMarkers();
+                }).exceptionally(e -> {
                     updater.sendMessage(ChatHelper.getErrorString("Something went wrong while updating the warp group %s! Please take a look at the console.", warpGroup.getName()));
                     e.printStackTrace();
                     return null;
@@ -175,9 +184,11 @@ public void deleteWarp(Player deleter, Warp warp){
             @Override
             public void onResponse(String response) {
                 // Update the cache
-                NetworkModule.getInstance().updateCache().thenRun(() ->
-                        ChatHelper.sendSuccessfulMessage(deleter, "Successfully deleted the warp %s!", warp.getName())
-                );
+                NetworkModule.getInstance().updateCache().thenRun(() -> {
+                    ChatHelper.sendSuccessfulMessage(deleter, "Successfully deleted the warp %s!", warp.getName());
+                    // Refresh BlueMap markers
+                    refreshBluemapMarkers();
+                });
             }
 
             @Override
@@ -199,9 +210,11 @@ public void deleteWarpGroup(Player deleter, WarpGroup warpGroup){
             @Override
             public void onResponse(String response) {
                 // Update the cache
-                NetworkModule.getInstance().updateCache().thenRun(() ->
-                        ChatHelper.sendSuccessfulMessage(deleter, "Successfully deleted the warp group %s!", warpGroup.getName())
-                );
+                NetworkModule.getInstance().updateCache().thenRun(() -> {
+                    ChatHelper.sendSuccessfulMessage(deleter, "Successfully deleted the warp group %s!", warpGroup.getName());
+                    // Refresh BlueMap markers
+                    refreshBluemapMarkers();
+                });
             }
 
             @Override
@@ -212,4 +225,18 @@ public void onFailure(IOException e) {
         });
     }
 
+    /**
+     * Refreshes BlueMap markers for all warp groups.
+     * <p>
+     * This method is called after any warp or warp group is created, updated, or deleted
+     * to ensure the BlueMap display stays in sync with the current state.
+     * </p>
+     */
+    private void refreshBluemapMarkers() {
+        if (NavigationModule.getInstance().getBluemapComponent() != null
+                && NavigationModule.getInstance().getBluemapComponent().isEnabled()) {
+            NavigationModule.getInstance().getBluemapComponent().refreshAllMarkers();
+        }
+    }
+
 }
diff --git a/src/main/java/net/buildtheearth/buildteamtools/utils/io/ConfigPaths.java b/src/main/java/net/buildtheearth/buildteamtools/utils/io/ConfigPaths.java
@@ -41,6 +41,10 @@ public static class Navigation {
         // Navigator.Warps
         private static final String NAVIGATOR_WARPS = "warps.";
         public static final String WARPS_GROUP_SORTING_MODE = NAVIGATOR_WARPS + "sorting-mode";
+
+        // BlueMap Integration
+        private static final String BLUEMAP = "bluemap.";
+        public static final String BLUEMAP_ENABLED = BLUEMAP + "enabled";
     }
 
     public static class PlotSystem {
diff --git a/src/main/resources/modules/navigation/config.yml b/src/main/resources/modules/navigation/config.yml
@@ -47,5 +47,10 @@ warps:
   # Possible values: default (same as the creation order), name
   sorting-mode: default
 
+# Configures the BlueMap integration
+bluemap:
+  # Enables or disables the BlueMap integration for displaying warps [true|false]
+  enabled: true
+
 # NOTE: Do not change
 config-version: 1.6
