Improved Waypoints

Author: cev-api

README.md

@@ -22,7 +22,7 @@ You can adjust your own maximum zoom (I recommend 6000) using the command ```/sm
 ### World Border Limit
 Limit the SeedMap and Minimap to a server's world border size so the map only shows that area (centered at 0,0).
 
-Set it with ```/sm:config WorldBorder 8000``` to show a border from -8000 to +8000 on both axes. Use 0 to disable.
+Set it with ```/sm:config WorldBorder set 8000``` to show a border from -8000 to +8000 on both axes. Use 0 to disable.
 
 ### Double Click Recenter
 Double clicking anywhere on the map will recenter the map to the players location.

src/main/java/dev/xpple/seedmapper/seedmap/SeedMapScreen.java

@@ -951,9 +951,12 @@ private void importWurstWaypoints() {
         Map<String, Waypoint> existing = waypointsApi.getWorldWaypoints(identifier);
         Set<String> reservedNames = new HashSet<>(existing.keySet());
         Set<String> occupiedCoords = new HashSet<>();
+        Map<String, String> coordToName = new Object2ObjectOpenHashMap<>();
         existing.forEach((existingName, existingWaypoint) -> {
             BlockPos pos = existingWaypoint.location();
-            occupiedCoords.add("%d,%d,%d".formatted(pos.getX(), pos.getY(), pos.getZ()));
+            String coordKey = "%d,%d,%d".formatted(pos.getX(), pos.getY(), pos.getZ());
+            occupiedCoords.add(coordKey);
+            coordToName.putIfAbsent(coordKey, existingName);
         });
         JsonArray waypoints = root.getAsJsonArray("waypoints");
         int added = 0;
@@ -1008,6 +1011,30 @@ private void importWurstWaypoints() {
 
             String coordKey = "%d,%d,%d".formatted(x, y, z);
             if (occupiedCoords.contains(coordKey)) {
+                String existingNameAtCoord = coordToName.get(coordKey);
+                if (existingNameAtCoord == null) {
+                    skipped++;
+                    continue;
+                }
+                String targetName = existingNameAtCoord.equals(name) ? existingNameAtCoord : name;
+                if (!existingNameAtCoord.equals(targetName)) {
+                    if (reservedNames.contains(targetName)) {
+                        targetName = this.createUniqueWurstName(reservedNames, name);
+                    }
+                    boolean renamed = this.tryRenameSimpleWaypoint(identifier, existingNameAtCoord, targetName);
+                    if (!renamed) {
+                        skipped++;
+                        continue;
+                    }
+                    reservedNames.remove(existingNameAtCoord);
+                    reservedNames.add(targetName);
+                    coordToName.put(coordKey, targetName);
+                }
+                this.wurstWaypointNames.add(targetName);
+                this.wurstWaypointDisplayNames.put(targetName, rawName);
+                if (color != null) {
+                    this.wurstWaypointColors.put(targetName, color);
+                }
                 skipped++;
                 continue;
             }
@@ -1074,6 +1101,20 @@ private boolean addSimpleWaypoint(String identifier, ResourceKey<Level> dimensio
         }
     }
 
+    private boolean tryRenameSimpleWaypoint(String identifier, String oldName, String newName) {
+        if (identifier == null || identifier.isBlank() || oldName == null || newName == null) {
+            return false;
+        }
+        SimpleWaypointsAPI api = SimpleWaypointsAPI.getInstance();
+        try {
+            api.renameWaypoint(identifier, oldName, newName);
+            return true;
+        } catch (CommandSyntaxException e) {
+            LOGGER.warn("Failed to rename waypoint", e);
+            return false;
+        }
+    }
+
     private String createUniqueWurstName(Set<String> reservedNames, String base) {
         String candidate = buildWurstNameWithSuffix(base, "_W");
         if (!reservedNames.contains(candidate)) {