Add option to require claim adjacency, close #71 (#193)

Author: WiIIiam278

common/src/main/java/net/william278/husktowns/claim/ClaimWorld.java

@@ -134,6 +134,11 @@ public List<TownClaim> getClaimsNear(@NotNull Chunk chunk, int radius, @NotNull
         return townClaims;
     }
 
+    @NotNull
+    public List<TownClaim> getAdjacentClaims(@NotNull Chunk chunk, @NotNull HuskTowns plugin) {
+        return getClaimsNear(chunk, 1, plugin);
+    }
+
     public void removeAdminClaim(@NotNull Chunk chunk) {
         adminClaims.removeIf(claim -> claim.getChunk().equals(chunk));
     }

common/src/main/java/net/william278/husktowns/config/Settings.java

@@ -180,6 +180,10 @@ public class Settings {
     @YamlKey("towns.minimum_chunk_separation")
     private int minimumChunkSeparation = 0;
 
+    @YamlComment("Require towns to have all their claims adjacent to each other")
+    @YamlKey("towns.require_claim_adjacency")
+    private boolean requireClaimAdjacency = false;
+
     // Admin Town settings
     @YamlComment("Admin Town settings for changing how admin claims look")
     @YamlKey("towns.admin_town.name")
@@ -369,6 +373,10 @@ public int getMinimumChunkSeparation() {
         return minimumChunkSeparation;
     }
 
+    public boolean doRequireClaimAdjacency() {
+        return requireClaimAdjacency;
+    }
+
     @NotNull
     public String getAdminTownName() {
         return adminTownName;
@@ -378,4 +386,5 @@ public String getAdminTownName() {
     public Color getAdminTownColor() {
         return Color.decode(adminTownColor);
     }
+
 }

common/src/main/java/net/william278/husktowns/manager/ClaimsManager.java

@@ -35,15 +35,29 @@ public void createClaim(@NotNull OnlineUser user, @NotNull World world, @NotNull
                 return;
             }
 
+            // Get the claim world
             final Optional<ClaimWorld> optionalClaimWorld = plugin.getClaimWorld(world);
             if (optionalClaimWorld.isEmpty()) {
                 plugin.getLocales().getLocale("error_world_not_claimable")
                         .ifPresent(user::sendMessage);
                 return;
             }
-
-            // Check against nearby claims
             final ClaimWorld claimWorld = optionalClaimWorld.get();
+
+            // Carry out adjacency check
+            if (plugin.getSettings().doRequireClaimAdjacency() && member.town().getClaimCount() > 0) {
+                final Optional<TownClaim> adjacentClaim = claimWorld
+                        .getAdjacentClaims(chunk, plugin).stream()
+                        .filter(claim -> claim.town().equals(member.town()))
+                        .findFirst();
+                if (adjacentClaim.isEmpty()) {
+                    plugin.getLocales().getLocale("error_claim_not_adjacent")
+                            .ifPresent(user::sendMessage);
+                    return;
+                }
+            }
+
+            // Carry out minimum chunk separation check
             final Optional<TownClaim> nearbyClaim = claimWorld
                     .getClaimsNear(chunk, plugin.getSettings().getMinimumChunkSeparation(), plugin).stream()
                     .filter(claim -> !claim.town().equals(member.town()))

common/src/main/resources/locales/en-gb.yml

@@ -176,6 +176,7 @@ error_no_towns: '[Error:](#ff3300) [No towns have been created yet](#ff7e5e)'
 error_world_not_claimable: '[Error:](#ff3300) [Claims cannot be created in this world](#ff7e5e)'
 error_chunk_claimed_by: '[Error:](#ff3300) [That chunk has been claimed by %1%](#ff7e5e)'
 error_claim_too_close_to: '[Error:](#ff3300) [A claim there would be too close to %1%''s claim](#ff7e5e)'
+error_claim_not_adjacent: '[Error:](#ff3300) [A claim there would not be adjacent to your existing claims](#ff7e5e)'
 error_operation_not_allowed: '[Error:](#ff3300) [You can''t do that here!](#ff7e5e)'
 error_claim_limit_reached: '[Error:](#ff3300) [The town has used all of its'' claim slots. (%1%/%2%)](#ff7e5e)'
 error_town_member_limit_reached: '[Error:](#ff3300) [The town has reached the maximum number of members. (%1%/%2%)](#ff7e5e)'

common/src/main/resources/locales/es-es.yml

@@ -176,6 +176,7 @@ error_no_towns: '[Error:](#ff3300) [Aún no se han creado ciudades](#ff7e5e)'
 error_world_not_claimable: '[Error:](#ff3300) [No se pueden reclamar terrenos aqui.](#ff7e5e)'
 error_chunk_claimed_by: '[Error:](#ff3300) [Este terreno ha sido reclamado por %1%](#ff7e5e)'
 error_claim_too_close_to: '[Error:](#ff3300) [A claim there would be too close to %1%''s claim](#ff7e5e)'
+error_claim_not_adjacent: '[Error:](#ff3300) [A claim there would not be adjacent to your existing claims](#ff7e5e)'
 error_operation_not_allowed: '[Error:](#ff3300) [No puedes hacer eso aquí!](#ff7e5e)'
 error_claim_limit_reached: '[Error:](#ff3300) [La ciudad ha alcanzado el max de terrenos permitidos. (%1%/%2%)](#ff7e5e)'
 error_town_member_limit_reached: '[Error:](#ff3300) [La ciudad ha alcanzado el max de mimebros permitidos. (%1%/%2%)](#ff7e5e)'

common/src/main/resources/locales/zh-cn.yml

@@ -176,6 +176,7 @@ error_no_towns: '[错误:](#ff3300) [没有城镇被创立](#ff7e5e)'
 error_world_not_claimable: '[错误:](#ff3300) [这个世界内无法圈地](#ff7e5e)'
 error_chunk_claimed_by: '[错误:](#ff3300) [这个区块已经被 %1% 控制](#ff7e5e)'
 error_claim_too_close_to: '[错误:](#ff3300) [这个圈地区域距离 %1%的控制区域太近](#ff7e5e)'
+error_claim_not_adjacent: '[Error:](#ff3300) [A claim there would not be adjacent to your existing claims](#ff7e5e)'
 error_operation_not_allowed: '[错误:](#ff3300) [你无法在这里这样做!](#ff7e5e)'
 error_claim_limit_reached: '[错误:](#ff3300) [该城镇已经使用了所有的土地. (%1%/%2%)](#ff7e5e)'
 error_town_member_limit_reached: '[错误:](#ff3300) [该城镇已经满员了. (%1%/%2%)](#ff7e5e)'