Rework Tags

Tags are no longer a registry type

Author: Faithcaio

src/main/java/org/spongepowered/api/registry/Registry.java

@@ -122,7 +122,20 @@ default <V extends T> Optional<V> findValue(final RegistryKey<T> key) {
      */
     <V extends T> V value(ResourceKey key);
 
-    <V extends T> Set<V> taggedValues(Tag<T> key);
+    /**
+     * Returns the registered types associated with given tag.
+     * @param tag The tag
+     *
+     * @return The registered types associated with given tag
+     */
+    <V extends T> Set<V> taggedValues(Tag<T> tag);
+
+    /**
+     * Gets the tags associated with this registry.
+     *
+     * @return The tags associated with this registry
+     */
+    <V extends T> Stream<Tag<V>> tags();
 
     /**
      * {@link Registry#value(ResourceKey)}, provided for convenience when using {@link RegistryKey}.

src/main/java/org/spongepowered/api/registry/RegistryTypes.java

@@ -137,13 +137,8 @@
 import org.spongepowered.api.service.economy.Currency;
 import org.spongepowered.api.service.economy.account.AccountDeletionResultType;
 import org.spongepowered.api.service.economy.transaction.TransactionType;
-import org.spongepowered.api.state.BooleanStateProperty;
-import org.spongepowered.api.state.EnumStateProperty;
-import org.spongepowered.api.state.IntegerStateProperty;
 import org.spongepowered.api.statistic.Statistic;
 import org.spongepowered.api.statistic.StatisticCategory;
-import org.spongepowered.api.tag.Tag;
-import org.spongepowered.api.tag.TagType;
 import org.spongepowered.api.util.mirror.Mirror;
 import org.spongepowered.api.util.orientation.Orientation;
 import org.spongepowered.api.util.rotation.Rotation;
@@ -237,8 +232,6 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<BellAttachmentType> BELL_ATTACHMENT_TYPE = RegistryTypes.spongeKeyInGame("bell_attachment_type");
 
-    public static final DefaultedRegistryType<Tag<BlockType>> BLOCK_TYPE_TAGS = RegistryTypes.spongeKeyInGame("block_type_tags");
-
     public static final DefaultedRegistryType<BoatType> BOAT_TYPE = RegistryTypes.spongeKeyInGame("boat_type");
 
     public static final DefaultedRegistryType<BodyPart> BODY_PART = RegistryTypes.spongeKeyInGame("body_part");
@@ -289,16 +282,12 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<DyeColor> DYE_COLOR = RegistryTypes.spongeKeyInGame("dye_color");
 
-    public static final DefaultedRegistryType<Tag<EntityType<@NonNull ?>>> ENTITY_TYPE_TAGS = RegistryTypes.spongeKeyInGame("entity_type_tags");
-
     public static final DefaultedRegistryType<EquipmentGroup> EQUIPMENT_GROUP = RegistryTypes.spongeKeyInGame("equipment_group");
 
     public static final DefaultedRegistryType<EquipmentType> EQUIPMENT_TYPE = RegistryTypes.spongeKeyInGame("equipment_type");
 
     public static final DefaultedRegistryType<FireworkShape> FIREWORK_SHAPE = RegistryTypes.spongeKeyInGame("firework_shape");
 
-    public static final DefaultedRegistryType<Tag<FluidType>> FLUID_TYPE_TAGS = RegistryTypes.spongeKeyInGame("fluid_type_tags");
-
     public static final DefaultedRegistryType<FoxType> FOX_TYPE = RegistryTypes.spongeKeyInGame("fox_type");
 
     public static final DefaultedRegistryType<GameMode> GAME_MODE = RegistryTypes.spongeKeyInGame("game_mode");
@@ -325,8 +314,6 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<ItemTier> ITEM_TIER = RegistryTypes.spongeKeyInGame("item_tier");
 
-    public static final DefaultedRegistryType<Tag<ItemType>> ITEM_TYPE_TAGS = RegistryTypes.spongeKeyInGame("item_type_tags");
-
     public static final DefaultedRegistryType<JigsawBlockOrientation> JIGSAW_BLOCK_ORIENTATION = RegistryTypes.spongeKeyInGame("jigsaw_block_orientation");
 
     public static final DefaultedRegistryType<LightType> LIGHT_TYPE = RegistryTypes.spongeKeyInGame("light_type");
@@ -413,8 +400,6 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<StructureMode> STRUCTURE_MODE = RegistryTypes.spongeKeyInGame("structure_mode");
 
-    public static final DefaultedRegistryType<TagType<@NonNull ?>> TAG_TYPES = RegistryTypes.spongeKeyInGame("tag_type");
-
     public static final DefaultedRegistryType<TaskPriority> TASK_PRIORITY = RegistryTypes.spongeKeyInGame("task_priority");
 
     public static final DefaultedRegistryType<TeleportHelperFilter> TELEPORT_HELPER_FILTER = RegistryTypes.spongeKeyInGame("teleport_helper_filter");

src/main/java/org/spongepowered/api/state/BooleanStateProperties.java

@@ -29,6 +29,7 @@
  */
 @SuppressWarnings("unused")
 public final class BooleanStateProperties {
+
     private BooleanStateProperties() {
     }
 

src/main/java/org/spongepowered/api/state/EnumStateProperties.java

@@ -51,6 +51,7 @@
  */
 @SuppressWarnings("unused")
 public final class EnumStateProperties {
+
     private EnumStateProperties() {
     }
 

src/main/java/org/spongepowered/api/state/IntegerStateProperties.java

@@ -29,6 +29,7 @@
  */
 @SuppressWarnings("unused")
 public final class IntegerStateProperties {
+
     private IntegerStateProperties() {
     }