Change dynmap claim grouping to use the same algorithm as the other maps

Author: BlueZeeKing

src/main/java/io/icker/factions/util/ClaimGrouper.java

@@ -249,103 +249,4 @@ public static List<List<Vector2i>> convertLineSegmentsToOutlines(
 
         return holes;
     }
-
-    /**
-     * Takes a list of all claims in a level and groups them using BFS. While doing that it measures
-     * all the sides of all the claims that are on a border from claimed territory and wilderness.
-     *
-     * <p>The returned segments are directional.
-     *
-     * <p>As opposed to @see ClaimGrouper#convertClaimsToLineSegmentGroups(), this function also
-     * creates line segments to bridge the gap between the outside outline and any inner holes. This
-     * is need by dymap because dynmap doesn't support holes in markers.
-     *
-     * @param claims A set of vectors that represents the coordinates of a claim (@see
-     *     ClaimGrouper#separateClaimsByLevel())
-     * @return A list of edges. The edges are returned as a map where the entries represent one
-     *     corner of a claim and the values are other corners in connects too. The list has either
-     *     one or two elements.
-     */
-    public static List<Map<Vector2i, Vector2i[]>> convertClaimsToLineSegmentGroupsWithoutHoles(
-            Set<Vector2i> claims) {
-        Set<Vector2i> remaining_claims = new HashSet<>(claims);
-        Queue<Vector2i> queue = new LinkedList<>();
-        List<Map<Vector2i, Vector2i[]>> groups = new ArrayList<>();
-
-        while (!remaining_claims.isEmpty()) {
-            Iterator<Vector2i> iter = remaining_claims.iterator();
-            Vector2i item = iter.next();
-            queue.add(item);
-            remaining_claims.remove(item);
-
-            Map<Vector2i, Vector2i[]> lines = new HashMap<>();
-
-            while (!queue.isEmpty()) {
-                Vector2i claim = queue.remove();
-
-                for (Vector2i dir :
-                        new Vector2i[] {
-                            new Vector2i(1, 0),
-                            new Vector2i(-1, 0),
-                            new Vector2i(0, 1),
-                            new Vector2i(0, -1)
-                        }) {
-                    Vector2i new_claim = claim.add(dir);
-                    // The BFS part
-                    if (remaining_claims.contains(new_claim)) {
-                        queue.add(new_claim);
-                        remaining_claims.remove(new_claim);
-                    } else {
-                        Vector2i start; // both of these are in block coordinates
-                        Vector2i end;
-
-                        if (dir.getX() == 0) {
-                            // the y component is being used as the x component so that the
-                            // direction is correct
-                            start = claim.mul(16).add(new Vector2i(dir.getY(), dir.getY()).mul(8));
-                            end = claim.mul(16).add(new Vector2i(-dir.getY(), dir.getY()).mul(8));
-                        } else {
-                            start = claim.mul(16).add(new Vector2i(dir.getX(), -dir.getX()).mul(8));
-                            end = claim.mul(16).add(new Vector2i(dir.getX(), dir.getX()).mul(8));
-                        }
-
-                        start =
-                                start.add(
-                                        new Vector2i(
-                                                8,
-                                                8)); // offset to match how minecraft converts chunk
-                        // coords to block coords
-                        end = end.add(new Vector2i(8, 8));
-
-                        boolean has_opposite_line = false;
-
-                        if (lines.containsKey(end)) {
-                            for (Vector2i possible_start : lines.get(end)) {
-                                if (possible_start.equals(start)) {
-                                    has_opposite_line = true;
-                                }
-                            }
-                        }
-
-                        if (!has_opposite_line
-                                && claims.contains(new_claim)
-                                && !(queue.contains(new_claim)
-                                        || remaining_claims.contains(new_claim))) {
-                            continue;
-                        }
-
-                        if (lines.containsKey(start)) {
-                            lines.put(start, new Vector2i[] {lines.get(start)[0], end});
-                        } else {
-                            lines.put(start, new Vector2i[] {end});
-                        }
-                    }
-                }
-            }
-
-            groups.add(lines);
-        }
-
-        return groups;
-    }
 }

src/main/java/io/icker/factions/util/DynmapWrapper.java

@@ -125,42 +125,37 @@ private void generateMarkers() {
                     ClaimGrouper.separateClaimsByLevel(faction).entrySet()) {
                 String level = entry.getKey();
                 for (Map<Vector2i, Vector2i[]> group :
-                        ClaimGrouper.convertClaimsToLineSegmentGroupsWithoutHoles(
+                        ClaimGrouper.convertClaimsToLineSegmentGroups(
                                 entry.getValue())) {
-                    List<List<Vector2i>> outlines =
-                            ClaimGrouper.convertLineSegmentsToOutlines(group);
-                    if (outlines.size() > 1) {
-                        FactionsMod.LOGGER.error(
-                                "The claim chunking algorithm used for dynmap has failed, please"
-                                        + " report this asap.");
-                    }
-                    outlines.getFirst().add(outlines.getFirst().getFirst());
-                    double[] x_coords =
-                            outlines.getFirst().stream()
-                                    .mapToDouble((point) -> (double) point.getX())
-                                    .toArray();
-                    double[] z_coords =
-                            outlines.getFirst().stream()
-                                    .mapToDouble((point) -> (double) point.getY())
-                                    .toArray();
-                    double[] y_coords =
-                            outlines.getFirst().stream().mapToDouble((point) -> 320.0).toArray();
+                    for (List<Vector2i> outline : ClaimGrouper.convertLineSegmentsToOutlines(group)) {
+                        outline.add(outline.get(0));
+                        double[] x_coords =
+                                outline.stream()
+                                        .mapToDouble((point) -> (double) point.getX())
+                                        .toArray();
+                        double[] z_coords =
+                                outline.stream()
+                                        .mapToDouble((point) -> (double) point.getY())
+                                        .toArray();
+                        double[] y_coords =
+                                outline.stream().mapToDouble((point) -> 320.0).toArray();
 
-                    PolyLineMarker marker =
-                            markerSet.createPolyLineMarker(
-                                    UUID.randomUUID().toString(),
-                                    "",
-                                    false,
-                                    dimensionTagToID(level),
-                                    x_coords,
-                                    y_coords,
-                                    z_coords,
-                                    true);
-                    if (marker != null) {
-                        marker.setLineStyle(
-                                marker.getLineWeight(),
-                                marker.getLineOpacity(),
-                                faction.getColor().getColorValue());
+                        PolyLineMarker marker =
+                                markerSet.createPolyLineMarker(
+                                        UUID.randomUUID().toString(),
+                                        "",
+                                        false,
+                                        dimensionTagToID(level),
+                                        x_coords,
+                                        y_coords,
+                                        z_coords,
+                                        true);
+                        if (marker != null) {
+                            marker.setLineStyle(
+                                    marker.getLineWeight(),
+                                    marker.getLineOpacity(),
+                                    faction.getColor().getColorValue());
+                        }
                     }
                 }
             }