Refactoring:

De-duplicates methods in the Paper/Folia HUD.

Change Set<Player> to Set<UUID> in Paper/FoliaHUD.

Change PermHUD and MapHUD constructors to take in HUD instead of
building them internally.

Author: LlmDl

Towny/src/main/java/com/palmergames/bukkit/towny/huds/HUDManager.java

@@ -5,6 +5,7 @@
 import com.palmergames.bukkit.towny.event.PlayerChangePlotEvent;
 import com.palmergames.bukkit.towny.event.TownBlockSettingsChangedEvent;
 import com.palmergames.bukkit.towny.huds.providers.FoliaHUD;
+import com.palmergames.bukkit.towny.huds.providers.HUD;
 import com.palmergames.bukkit.towny.huds.providers.PaperHUD;
 import com.palmergames.bukkit.towny.huds.providers.ServerHUD;
 import com.palmergames.bukkit.towny.object.WorldCoord;
@@ -31,10 +32,12 @@ public class HUDManager implements Listener {
 	public HUDManager(Towny plugin) {
 		boolean isFolia = Towny.getPlugin().isFolia();
 
-		PermHUD permHud = new PermHUD("permHUD", PERM_HUD_OBJECTIVE_NAME, (p) -> PermHUD.updatePerms(p), (p, wc) -> PermHUD.updatePerms(p, (WorldCoord) wc));
+		HUD permHUD = new HUD("permHUD", PERM_HUD_OBJECTIVE_NAME, (p) -> PermHUD.updatePerms(p), (p, wc) -> PermHUD.updatePerms(p, (WorldCoord) wc));
+		PermHUD permHud = new PermHUD(permHUD);
 		huds.put("permHUD", isFolia ? new FoliaHUD(permHud) : new PaperHUD(permHud));
 
-		MapHUD mapHud = new MapHUD("mapHUD", MAP_HUD_OBJECTIVE_NAME, (p) -> MapHUD.updateMap(p), (p, wc) -> MapHUD.updateMap(p, (WorldCoord) wc));
+		HUD mapHUD = new HUD("mapHUD", MAP_HUD_OBJECTIVE_NAME, (p) -> MapHUD.updateMap(p), (p, wc) -> MapHUD.updateMap(p, (WorldCoord) wc));
+		MapHUD mapHud = new MapHUD(mapHUD);
 		huds.put("mapHUD", isFolia ? new FoliaHUD(mapHud) : new PaperHUD(mapHud));
 	}
 

Towny/src/main/java/com/palmergames/bukkit/towny/huds/MapHUD.java

@@ -21,9 +21,6 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
 import net.kyori.adventure.text.Component;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -35,8 +32,8 @@ public class MapHUD implements HUDImplementer {
 	private static final int halfMapLineWidth = mapLineWidth/2;
 	private static final int halfMapLineHeight = mapLineHeight/2;
 
-	public MapHUD(String name, String objectiveName, Consumer<Player> playerConsumer, BiConsumer<Player, Object> playerWithObjectConsumer) {
-		this.hud = new HUD(name, objectiveName, playerConsumer, playerWithObjectConsumer);
+	public MapHUD(HUD hud) {
+		this.hud = hud;
 	}
 
 	@Override

Towny/src/main/java/com/palmergames/bukkit/towny/huds/PermHUD.java

@@ -21,17 +21,14 @@
 import net.kyori.adventure.text.Component;
 import java.util.LinkedList;
 import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
 public class PermHUD implements HUDImplementer {
 	final HUD hud;
 
-	public PermHUD(String name, String objectiveName, Consumer<Player> playerConsumer, BiConsumer<Player, Object> playerWithObjectConsumer) {
-		this.hud = new HUD(name, objectiveName, playerConsumer, playerWithObjectConsumer);
+	public PermHUD(HUD hud) {
+		this.hud = hud;
 	}
 
 	@Override

Towny/src/main/java/com/palmergames/bukkit/towny/huds/providers/FoliaHUD.java

@@ -19,13 +19,13 @@
 
 public class FoliaHUD implements ServerHUD {
 
-	final String objectiveName;
 	final String displayName;
+	final String objectiveName;
 	final Consumer<Player> playerConsumer;
 	final BiConsumer<Player, Object> playerWithObjectConsumer;
 
 	Map<UUID, FastBoard> boardMap = new HashMap<>();
-	Set<Player> players = new HashSet<>();
+	Set<UUID> playerUUIDs = new HashSet<>();
 
 
 	public FoliaHUD(HUDImplementer implementer) {
@@ -36,35 +36,24 @@ public FoliaHUD(HUDImplementer implementer) {
 		this.playerWithObjectConsumer = hud.playerWithObjectConsumer;
 	}
 
-	public boolean hasPlayer(Player player) {
-		return getPlayers().contains(player);
-	}
-
-	public boolean addPlayer(Player player) {
-		return players.add(player);
-	}
-
-	public boolean removePlayer(Player player) {
-		return players.remove(player);
-	}
-
-	public Set<Player> getPlayers() {
-		return players;
+	public Set<UUID> getPlayerUUIDs() {
+		return playerUUIDs;
 	}
 
 	@Override
 	public boolean toggleOff(Player player) {
 		FastBoard board = boardMap.remove(player.getUniqueId());
 		if (board != null)
 			board.delete();
-
+		removePlayer(player);
 		return true;
 	}
 
 	@Override
 	public boolean toggleOn(Player player) {
 		FastBoard board = new FastBoard(player);
 		boardMap.put(player.getUniqueId(), board);
+		addPlayer(player);
 		updateHUD(player);
 		return true;
 	}

Towny/src/main/java/com/palmergames/bukkit/towny/huds/providers/PaperHUD.java

@@ -32,7 +32,7 @@ public class PaperHUD implements ServerHUD {
 	final BiConsumer<Player, Object> playerWithObjectConsumer;
 
 	Map<UUID, Scoreboard> boardMap = new HashMap<>();
-	Set<Player> players = new HashSet<>();
+	Set<UUID> playerUUIDs = new HashSet<>();
 
 	public PaperHUD(HUDImplementer implementer) {
 		HUD hud = implementer.getHUD();
@@ -42,30 +42,8 @@ public PaperHUD(HUDImplementer implementer) {
 		this.playerWithObjectConsumer = hud.playerWithObjectConsumer;
 	}
 
-	public boolean hasPlayer(Player player) {
-		return getPlayers().contains(player);
-	}
-
-	public boolean addPlayer(Player player) {
-		return players.add(player);
-	}
-
-	public boolean removePlayer(Player player) {
-		boardMap.remove(player.getUniqueId());
-		return players.remove(player);
-	}
-
-	public Set<Player> getPlayers() {
-		return players;
-	}
-
-	@Nullable
-	private Objective getObjective(UUID uuuid) {
-		Scoreboard board = boardMap.get(uuuid);
-		if (board == null)
-			return null;
-		Objective objective = board.getObjective(objectiveName);
-		return objective;
+	public Set<UUID> getPlayerUUIDs() {
+		return playerUUIDs;
 	}
 
 	@Override
@@ -133,4 +111,13 @@ public void updateHUD(Player player, Object object) {
 	public void updateHUD(Player player) {
 		playerConsumer.accept(player);
 	}
+
+	@Nullable
+	private Objective getObjective(UUID uuuid) {
+		Scoreboard board = boardMap.get(uuuid);
+		if (board == null)
+			return null;
+		Objective objective = board.getObjective(objectiveName);
+		return objective;
+	}
 }

Towny/src/main/java/com/palmergames/bukkit/towny/huds/providers/ServerHUD.java

@@ -3,9 +3,12 @@
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import org.bukkit.entity.Player;
 
+import com.palmergames.bukkit.util.BukkitTools;
+
 import net.kyori.adventure.text.Component;
 
 public abstract interface ServerHUD {
@@ -14,13 +17,23 @@ public abstract interface ServerHUD {
 
 	boolean toggleOn(Player player);
 
-	boolean hasPlayer(Player player);
+	public default boolean hasPlayer(Player player) {
+		return getPlayerUUIDs().contains(player.getUniqueId());
+	}
+
+	public default boolean addPlayer(Player player) {
+		return getPlayerUUIDs().add(player.getUniqueId());
+	}
 
-	boolean addPlayer(Player player);
+	public default boolean removePlayer(Player player) {
+		return getPlayerUUIDs().remove(player.getUniqueId());
+	}
 
-	boolean removePlayer(Player player);
+	public Set<UUID> getPlayerUUIDs();
 
-	Set<Player> getPlayers();
+	public default Set<Player> getPlayers() {
+		return getPlayerUUIDs().stream().map(uuid -> BukkitTools.getPlayer(uuid)).collect(Collectors.toSet());
+	}
 
 	boolean isActive(Player player);