Add configurable peaceful town restrictions for homeblock moves and capitals (#1006)

- Adds peaceful_towns.cannot_move_homeblock config option to control whether peaceful towns can move their homeblock
- Adds peaceful_towns.allow_peaceful_capitals config option to allow nation capitals to be peaceful

Both default to existing behavior (homeblock moves blocked, capitals forced non-peaceful)

Author: CodahWasTaken

src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownEventListener.java

@@ -162,7 +162,7 @@ public void onTownUnclaim(TownPreUnclaimCmdEvent event) {
 	}
 
 	/*
-	 * If town is peaceful, sieged, or occupied, it can't move homeblock.
+	 * If town is peaceful (configurable), sieged, or occupied, it can't move homeblock.
 	 * otherwise the move homeblock command could be / definitely would be
 	 * used by players as an easy exploit to escape occupation.
 	 * 
@@ -176,6 +176,7 @@ public void on(TownPreSetHomeBlockEvent event) {
 		if (SiegeWarSettings.getWarSiegeEnabled()) {
 			Translator translator = Translator.locale(event.getPlayer());
 			if(SiegeWarSettings.getWarCommonPeacefulTownsEnabled()
+				&& SiegeWarSettings.arePeacefulTownsNotAllowedToMoveHomeBlock()
 				&& SiegeWarTownPeacefulnessUtil.isTownPeaceful(event.getTown())) {
 				event.setCancelled(true);
 				event.setCancelMessage(translator.of("siegewar_plugin_prefix") + translator.of("msg_err_peaceful_town_cannot_move_homeblock"));

src/main/java/com/gmail/goosius/siegewar/settings/ConfigNodes.java

@@ -626,6 +626,17 @@ public enum ConfigNodes {
 			"",
 			"# Prevents players in peaceful towns from being given ranks with military-rank-permission nodes.",
 			"# It is not recommended to set this to false."),
+	PEACEFUL_TOWNS_CANNOT_MOVE_HOMEBLOCK(
+			"peaceful_towns.cannot_move_homeblock",
+			"true",
+			"",
+			"# If this is true, peaceful towns cannot move their homeblock."),
+	PEACEFUL_TOWNS_ALLOW_PEACEFUL_CAPITALS(
+			"peaceful_towns.allow_peaceful_capitals",
+			"false",
+			"",
+			"# If this is true, nation capital towns are allowed to be peaceful.",
+			"# By default, capital towns are forced to be non-peaceful."),
 
 	OCCUPIED_TOWNS(
 			"occupied_towns",

src/main/java/com/gmail/goosius/siegewar/settings/SiegeWarSettings.java

@@ -266,6 +266,14 @@ public static boolean arePeacefulTownsNotAllowedToAssignMilitaryRanks() {
 		return Settings.getBoolean(ConfigNodes.PEACEFUL_TOWNS_CANNOT_ASSIGN_MILITARY_RANKS);
 	}
 
+	public static boolean arePeacefulTownsNotAllowedToMoveHomeBlock() {
+		return Settings.getBoolean(ConfigNodes.PEACEFUL_TOWNS_CANNOT_MOVE_HOMEBLOCK);
+	}
+
+	public static boolean arePeacefulCapitalsAllowed() {
+		return Settings.getBoolean(ConfigNodes.PEACEFUL_TOWNS_ALLOW_PEACEFUL_CAPITALS);
+	}
+
 	public static int getWarCommonPeacefulTownsNewTownConfirmationRequirementDays() {
 		return Settings.getInt(ConfigNodes.PEACEFUL_TOWNS_NEW_TOWN_CONFIRMATION_REQUIREMENT_DAYS);
 	}

src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarTownPeacefulnessUtil.java

@@ -86,8 +86,8 @@ public static void updateTownPeacefulnessCounters(Town town) {
 		}
 		TownMetaDataController.setPeacefulnessChangeCountdownDays(town, 0);
 
-		// The Town would become a peaceful capital city, which is not allowed.
-		if (town.isCapital() && !TownMetaDataController.getPeacefulness(town)) {
+		// The Town would become a peaceful capital city, which is not allowed (unless configured).
+		if (!SiegeWarSettings.arePeacefulCapitalsAllowed() && town.isCapital() && !TownMetaDataController.getPeacefulness(town)) {
 			TownyMessaging.sendPrefixedTownMessage(town, Translatable.of("msg_err_your_town_cannot_be_peaceful_while_a_capital_city"));
 			return;
 		}
@@ -126,7 +126,7 @@ public static void toggleTownPeacefulness(Player player) {
 		}
 
 		Town town = resident.getTownOrNull();
-		if (town.isCapital()) {
+		if (!SiegeWarSettings.arePeacefulCapitalsAllowed() && town.isCapital()) {
 			if (!isTownPeaceful(town)) {
 				//If the capital is non-peaceful, it cannot switch to peaceful
 				TownyMessaging.sendErrorMsg(player, translator.of("msg_err_capital_towns_cannot_go_peaceful"));
@@ -261,6 +261,8 @@ private static void removePeacefulness(Town town) {
 	 * then start the switch process
 	 */
 	public static void switchOffPeacefulnessForCapitals() {
+		if (SiegeWarSettings.arePeacefulCapitalsAllowed())
+			return;
 		for(Nation nation: new ArrayList<>(TownyAPI.getInstance().getNations())) {
 			if(isTownPeaceful(nation.getCapital()) && getTownPeacefulnessChangeCountdownDays(nation.getCapital()) == 0) {
 				toggleTownPeacefulness(nation.getCapital());