Add missing scoreboard criteria and getTeamColor

Author: thibaulthenry

src/main/java/org/spongepowered/api/GameRegistry.java

@@ -44,7 +44,9 @@
 import org.spongepowered.api.registry.RegistryModule;
 import org.spongepowered.api.registry.RegistryModuleAlreadyRegisteredException;
 import org.spongepowered.api.resourcepack.ResourcePack;
+import org.spongepowered.api.scoreboard.critieria.Criterion;
 import org.spongepowered.api.scoreboard.displayslot.DisplaySlot;
+import org.spongepowered.api.scoreboard.objective.Objective;
 import org.spongepowered.api.statistic.BlockStatistic;
 import org.spongepowered.api.statistic.EntityStatistic;
 import org.spongepowered.api.statistic.ItemStatistic;
@@ -351,6 +353,28 @@ <T extends CatalogType> GameRegistry registerModule(Class<T> catalogClass, Catal
      */
     Optional<ResourcePack> getResourcePackById(String id);
 
+    /**
+     * Gets a {@link Criterion} which causes an {@link Objective}
+     * to have a score for a player incremented when he kills a member of
+     * the given colored team.
+     *
+     * @param color The color for the criterion
+     * @return The team kill {@link Criterion} with the provided color,
+     * or <tt>Optional.empty()</tt> if not found
+     */
+    Optional<Criterion> getTeamKillCriterionForColor(TextColor color);
+
+    /**
+     * Gets a {@link Criterion} which causes an {@link Objective}
+     * to have a score for a player incremented when he has been killed by
+     * a member of the given colored team.
+     *
+     * @param color The color for the criterion
+     * @return The killed by team {@link Criterion} with the provided color,
+     * or <tt>Optional.empty()</tt> if not found
+     */
+    Optional<Criterion> getKilledByTeamCriterionForColor(TextColor color);
+
     /**
      * Gets a {@link DisplaySlot} which displays only for teams with the
      * provided color.

src/main/java/org/spongepowered/api/scoreboard/critieria/Criteria.java

@@ -35,6 +35,22 @@ public final class Criteria {
 
     // SORTFIELDS:ON
 
+    /**
+     * Represents a {@link Criterion} which causes an {@link Objective}
+     * to have a score that represents the amount of air the player has
+     * left from swimming under water, matches the air nbt tag of the
+     * player, on a scale of 0-300.
+     */
+    public static final Criterion AIR = DummyObjectProvider.createFor(Criterion.class, "AIR");
+
+    /**
+     * Represents a {@link Criterion} which causes an {@link Objective}
+     * to have a score for a player represent their amount of armor points,
+     * on a scale of 0-20. May appear as 0 for players before their armor
+     * has changed for the first time.
+     */
+    public static final Criterion ARMOR = DummyObjectProvider.createFor(Criterion.class, "ARMOR");
+
     /**
      * Represents a {@link Criteria} which causes an {@link Objective}
      * to have a score for a player incremented when they die.
@@ -47,6 +63,14 @@ public final class Criteria {
      */
     public static final Criterion DUMMY = DummyObjectProvider.createFor(Criterion.class, "DUMMY");
 
+    /**
+     * Represents a {@link Criterion} which causes an {@link Objective}
+     * to have a score that represents the amount of hunger points the
+     * player has, on a scale of 0-20. May appear as 0 for players before
+     * their foodLevel has changed for the first time.
+     */
+    public static final Criterion FOOD = DummyObjectProvider.createFor(Criterion.class, "FOOD");
+
     /**
      * Represents a {@link Criteria} which causes an {@link Objective} to have
      * a score for a player represent their current health, on a scale of 0-20
@@ -55,6 +79,12 @@ public final class Criteria {
      */
     public static final Criterion HEALTH = DummyObjectProvider.createFor(Criterion.class, "HEALTH");
 
+    /**
+     * Represents a {@link Criteria} which causes an {@link Objective} to have
+     * a score that matches the current experience level of the player.
+     */
+    public static final Criterion LEVEL = DummyObjectProvider.createFor(Criterion.class, "LEVEL");
+
     /**
      * Represents a {@link Criteria} which causes an {@link Objective}
      * to have a score for a player incremented when they kill a player.
@@ -74,6 +104,13 @@ public final class Criteria {
      */
     public static final Criterion TRIGGER = DummyObjectProvider.createFor(Criterion.class, "TRIGGER");
 
+    /**
+     * Represents a {@link Criteria} which causes an {@link Objective} to have
+     * a score that matches the total amount of experience the player has
+     * collected since their last death (or in other words, their score).
+     */
+    public static final Criterion XP = DummyObjectProvider.createFor(Criterion.class, "XP");
+
     // SORTFIELDS:OFF
 
     // Suppress default constructor to ensure non-instantiability.

src/main/java/org/spongepowered/api/scoreboard/critieria/Criterion.java

@@ -25,8 +25,12 @@
 package org.spongepowered.api.scoreboard.critieria;
 
 import org.spongepowered.api.CatalogType;
+import org.spongepowered.api.scoreboard.Team;
+import org.spongepowered.api.text.format.TextColor;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
+import java.util.Optional;
+
 /**
  * Represents a set of behaviours for an objective, which may cause it to be
  * automatically updated.
@@ -42,4 +46,11 @@ public interface Criterion extends CatalogType {
     @Override
     String getName();
 
+    /**
+     * Gets the {@link Team} color that this criterion depending on, if set.
+     *
+     * @return The {@link Team} color that this criterion depending on, if set
+     */
+    Optional<TextColor> getTeamColor();
+
 }