scoreboard team tags

DenizenScript · Jan 24, 2023 · 5f09335 · 5f09335
1 parent af1b177
commit 5f09335
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 0 deletions.
diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/utilities/PaperAPIToolsImpl.java b/paper/src/main/java/com/denizenscript/denizen/paper/utilities/PaperAPIToolsImpl.java
@@ -283,6 +283,16 @@ public void setTeamSuffix(Team team, String suffix) {
         team.suffix(PaperModule.parseFormattedText(suffix, ChatColor.WHITE));
     }
 
+    @Override
+    public String getTeamPrefix(Team team) {
+        return PaperModule.stringifyComponent(team.prefix());
+    }
+
+    @Override
+    public String getTeamSuffix(Team team) {
+        return PaperModule.stringifyComponent(team.suffix());
+    }
+
     @Override
     public String convertTextToMiniMessage(String text) {
         Component parsed = PaperModule.jsonToComponent(FormattedTextHelper.componentToJson(FormattedTextHelper.parse(text, ChatColor.WHITE, false)));

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -49,6 +49,8 @@
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.*;
 import org.bukkit.map.MapView;
+import org.bukkit.scoreboard.Scoreboard;
+import org.bukkit.scoreboard.Team;
 import org.bukkit.util.RayTraceResult;
 
 import java.util.*;
@@ -2492,6 +2494,22 @@ else if (foodLevel / maxHunger < 1) {
             return new ElementTag(id);
         });
 
+        // <--[tag]
+        // @attribute <PlayerTag.scoreboard_team_name[(<board>)]>
+        // @returns ElementTag
+        // @description
+        // Returns the name of the team the player is in for a given scoreboard, if any.
+        // If no scoreboard is specified, uses the default (main) board.
+        // -->
+        tagProcessor.registerTag(ElementTag.class, "scoreboard_team_name", (attribute, object) -> {
+            Scoreboard board = attribute.hasParam() ? ScoreboardHelper.getScoreboard(attribute.getParam()) : ScoreboardHelper.getMain();
+            Team team = board.getEntryTeam(object.getName());
+            if (team == null) {
+                return null;
+            }
+            return new ElementTag(team.getName());
+        });
+
         // <--[tag]
         // @attribute <PlayerTag.bossbar_ids>
         // @returns ListTag

diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
@@ -510,6 +510,28 @@ else if (value.startsWith("e@")) {
                 if (attribute.startsWith("members")) {
                     event.setReplacedObject(new ListTag(team.getEntries()).getObjectAttribute(attribute.fulfill(1)));
                 }
+
+                // <--[tag]
+                // @attribute <server.scoreboard[(<board>)].team[<team>].prefix>
+                // @returns ElementTag
+                // @description
+                // Returns the team's prefix.
+                // Optionally, specify which scoreboard to use.
+                // -->
+                if (attribute.startsWith("prefix")) {
+                    event.setReplacedObject(new ElementTag(PaperAPITools.instance.getTeamPrefix(team)).getObjectAttribute(attribute.fulfill(1)));
+                }
+
+                // <--[tag]
+                // @attribute <server.scoreboard[(<board>)].team[<team>].suffix>
+                // @returns ElementTag
+                // @description
+                // Returns the team's suffix.
+                // Optionally, specify which scoreboard to use.
+                // -->
+                if (attribute.startsWith("suffix")) {
+                    event.setReplacedObject(new ElementTag(PaperAPITools.instance.getTeamSuffix(team)).getObjectAttribute(attribute.fulfill(1)));
+                }
                 return;
             }
         }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/PaperAPITools.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/PaperAPITools.java
@@ -149,6 +149,14 @@ public void setTeamSuffix(Team team, String suffix) {
         team.setSuffix(suffix);
     }
 
+    public String getTeamPrefix(Team team) {
+        return team.getPrefix();
+    }
+
+    public String getTeamSuffix(Team team) {
+        return team.getSuffix();
+    }
+
     public String convertTextToMiniMessage(String text) {
         return text;
     }