chore: added TeamStagesHelper#hasTeamStage variant for players

Author: desht

common/src/main/java/dev/ftb/mods/ftbteams/api/TeamStagesHelper.java

@@ -1,14 +1,14 @@
 package dev.ftb.mods.ftbteams.api;
 
+import dev.ftb.mods.ftbteams.api.client.ClientTeamManager;
 import dev.ftb.mods.ftbteams.api.event.TeamEvent;
 import dev.ftb.mods.ftbteams.api.event.TeamPropertiesChangedEvent;
 import dev.ftb.mods.ftbteams.api.property.TeamProperties;
 import dev.ftb.mods.ftbteams.api.property.TeamPropertyCollection;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Utility class providing some convenience methods for querying and modifying the team stages for a team. These methods
@@ -77,6 +77,25 @@ public static boolean hasTeamStage(Team team, String stage) {
         return team.getProperty(TeamProperties.TEAM_STAGES).contains(stage);
     }
 
+    /**
+     * Check if a player has a particular team stage.
+     *
+     * @param player the player to check
+     * @param stage the stage to check
+     * @return true if the player's current team has the stage, false otherwise
+     */
+    public static boolean hasTeamStage(Player player, String stage) {
+        if (player instanceof ServerPlayer sp) {
+            return FTBTeamsAPI.api().getManager().getTeamForPlayer(sp)
+                    .map(team -> team.getProperty(TeamProperties.TEAM_STAGES).contains(stage))
+                    .orElse(false);
+        } else {
+            return FTBTeamsAPI.api().getClientManager().getTeamForPlayer(player)
+                    .map(team -> team.getProperty(TeamProperties.TEAM_STAGES).contains(stage))
+                    .orElse(false);
+        }
+    }
+
     /**
      * Get all the stages for a team.
      *

common/src/main/java/dev/ftb/mods/ftbteams/api/client/ClientTeamManager.java

@@ -3,6 +3,8 @@
 import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
 import dev.ftb.mods.ftbteams.api.Team;
 import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
@@ -50,6 +52,15 @@ public interface ClientTeamManager {
      */
     Optional<Team> getTeamByID(UUID teamId);
 
+    /**
+     * Get the current team for the given player. This will only succeed if the details for the player in question
+     * are in the known players list as returned by {@link #knownClientPlayers()}.
+     *
+     * @param player the player to check
+     * @return the team, or {@code Optional.empty()} if no team could be found
+     */
+    Optional<Team> getTeamForPlayer(Player player);
+
     /**
      * Get the client team data for this client player (i.e. {@link net.minecraft.client.Minecraft#player})
      *

common/src/main/java/dev/ftb/mods/ftbteams/data/ClientTeamManagerImpl.java

@@ -1,6 +1,7 @@
 package dev.ftb.mods.ftbteams.data;
 
 import dev.ftb.mods.ftbteams.FTBTeams;
+import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
 import dev.ftb.mods.ftbteams.api.Team;
 import dev.ftb.mods.ftbteams.api.client.ClientTeamManager;
 import dev.ftb.mods.ftbteams.api.client.KnownClientPlayer;
@@ -14,6 +15,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -126,6 +128,11 @@ public Optional<Team> getTeamByID(UUID teamId) {
 		return Optional.ofNullable(teamMap.get(teamId));
 	}
 
+	@Override
+	public Optional<Team> getTeamForPlayer(Player player) {
+		return getKnownPlayer(player.getUUID()).flatMap(kcp -> getTeamByID(kcp.teamId()));
+	}
+
 	@Override
 	public ClientTeam selfTeam() {
 		return selfTeam;