From b6eea44c47f39c27c546b5423f921abe377346bc Mon Sep 17 00:00:00 2001 From: SamB440 Date: Tue, 25 Apr 2023 18:42:00 +0100 Subject: [PATCH] Update shown text in DependencyRequirement to use region names and consider plurality --- .../requirements/DependencyRequirement.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/net/islandearth/rpgregions/requirements/DependencyRequirement.java b/api/src/main/java/net/islandearth/rpgregions/requirements/DependencyRequirement.java index ee5c8b8..90180d5 100644 --- a/api/src/main/java/net/islandearth/rpgregions/requirements/DependencyRequirement.java +++ b/api/src/main/java/net/islandearth/rpgregions/requirements/DependencyRequirement.java @@ -2,6 +2,7 @@ package net.islandearth.rpgregions.requirements; import com.google.common.collect.ImmutableList; import net.islandearth.rpgregions.api.IRPGRegionsAPI; +import net.islandearth.rpgregions.api.RPGRegionsAPI; import net.islandearth.rpgregions.gui.GuiEditable; import org.bukkit.entity.Player; @@ -49,7 +50,15 @@ public class DependencyRequirement extends RegionRequirement { @Override public String getText(Player player) { - return "Regions " + String.join(", ", requiredRegions); + List convertedIds = new ArrayList<>(); + for (String requiredRegion : requiredRegions) { + RPGRegionsAPI.getAPI().getManagers().getRegionsCache().getConfiguredRegion(requiredRegion).ifPresent(configured -> { + convertedIds.add(configured.getCustomName()); + }); + } + + final boolean plural = convertedIds.size() > 1; + return (plural ? "Regions: " : "Region: ") + String.join(", ", convertedIds); } @Override