Hide tax component on status screens if taxes are off. (#6221)

* Hide tax component on status screens if taxes are off. * Wrap more lines
TownyAdvanced · Oct 13, 2022 · 6869bf0 · 6869bf0
1 parent 5295d65
commit 6869bf0
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/src/com/palmergames/bukkit/towny/TownyFormatter.java b/src/com/palmergames/bukkit/towny/TownyFormatter.java
@@ -783,13 +783,19 @@ private static void addTownMoneyComponents(Town town, Translator translator, Sta
 				town.getAccount().setDebtCap(MoneyUtil.getEstimatedValueOfTown(town));
 			screen.addComponentOf("bankrupt", translator.of("status_bank_bankrupt") + " " + colourKeyValue(translator.of("status_debtcap"), "-" + formatMoney(town.getAccount().getDebtCap())));
 		}
-		if (town.hasUpkeep())
-			screen.addComponentOf("upkeep", translator.of("status_splitter") + colourKey(translator.of("status_bank_town2")) + " " + colourKeyImportant(formatMoney(BigDecimal.valueOf(TownySettings.getTownUpkeepCost(town)).setScale(2, RoundingMode.HALF_UP).doubleValue())));
-		if (TownySettings.getUpkeepPenalty() > 0 && town.isOverClaimed())
-			screen.addComponentOf("upkeepPenalty", translator.of("status_splitter") + colourKey(translator.of("status_bank_town_penalty_upkeep")) + " " + colourKeyImportant(formatMoney(TownySettings.getTownPenaltyUpkeepCost(town))));
-		if (town.isNeutral() && TownySettings.getTownNeutralityCost() > 0)
-			screen.addComponentOf("neutralityCost", translator.of("status_splitter") + colourKey(translator.of("status_neutrality_cost") + " " + colourKeyImportant(formatMoney(TownySettings.getTownNeutralityCost()))));
-		screen.addComponentOf("towntax", translator.of("status_splitter") + colourKey(translator.of("status_bank_town3")) + " " + colourKeyImportant(town.isTaxPercentage() ? town.getTaxes() + "%" : formatMoney(town.getTaxes())));
+
+		if (TownySettings.isTaxingDaily()) {
+			if (town.hasUpkeep())
+				screen.addComponentOf("upkeep", translator.of("status_splitter") + colourKey(translator.of("status_bank_town2")) + " " + colourKeyImportant(formatMoney(BigDecimal.valueOf(TownySettings.getTownUpkeepCost(town)).setScale(2, RoundingMode.HALF_UP).doubleValue())));
+
+			if (TownySettings.getUpkeepPenalty() > 0 && town.isOverClaimed())
+				screen.addComponentOf("upkeepPenalty", translator.of("status_splitter") + colourKey(translator.of("status_bank_town_penalty_upkeep")) + " " + colourKeyImportant(formatMoney(TownySettings.getTownPenaltyUpkeepCost(town))));
+
+			if (town.isNeutral() && TownySettings.getTownNeutralityCost() > 0)
+				screen.addComponentOf("neutralityCost", translator.of("status_splitter") + colourKey(translator.of("status_neutrality_cost") + " " + colourKeyImportant(formatMoney(TownySettings.getTownNeutralityCost()))));
+
+			screen.addComponentOf("towntax", translator.of("status_splitter") + colourKey(translator.of("status_bank_town3")) + " " + colourKeyImportant(town.isTaxPercentage() ? town.getTaxes() + "%" : formatMoney(town.getTaxes())));
+		}
 	}
 
 	/**
@@ -801,11 +807,15 @@ private static void addTownMoneyComponents(Town town, Translator translator, Sta
 	private static void addNationMoneyComponentsToScreen(Nation nation, Translator translator, StatusScreen screen) {
 		screen.addComponentOf("moneynewline", Component.newline());
 		screen.addComponentOf("bankString", colourKeyValue(translator.of("status_bank"), nation.getAccount().getHoldingFormattedBalance()));
-		if (TownySettings.getNationUpkeepCost(nation) > 0)
-			screen.addComponentOf("nationupkeep", translator.of("status_splitter") + colourKey(translator.of("status_bank_town2") + " " + colourKeyImportant(formatMoney(TownySettings.getNationUpkeepCost(nation)))));
-		if (nation.isNeutral() && TownySettings.getNationNeutralityCost() > 0)
-			screen.addComponentOf("neutralityCost", translator.of("status_splitter") + colourKey(translator.of("status_neutrality_cost") + " " + colourKeyImportant(formatMoney(TownySettings.getNationNeutralityCost()))));
-		screen.addComponentOf("nationtax", translator.of("status_splitter") + colourKey(translator.of("status_nation_tax")) + " " + colourKeyImportant(formatMoney(nation.getTaxes())));
+
+		if (TownySettings.isTaxingDaily()) {
+			if (TownySettings.getNationUpkeepCost(nation) > 0)
+				screen.addComponentOf("nationupkeep", translator.of("status_splitter") + colourKey(translator.of("status_bank_town2") + " " + colourKeyImportant(formatMoney(TownySettings.getNationUpkeepCost(nation)))));
+			if (nation.isNeutral() && TownySettings.getNationNeutralityCost() > 0)
+				screen.addComponentOf("neutralityCost", translator.of("status_splitter") + colourKey(translator.of("status_neutrality_cost") + " " + colourKeyImportant(formatMoney(TownySettings.getNationNeutralityCost()))));
+
+			screen.addComponentOf("nationtax", translator.of("status_splitter") + colourKey(translator.of("status_nation_tax")) + " " + colourKeyImportant(formatMoney(nation.getTaxes())));
+		}
 	}
 
 	private static String formatMoney(double money) {