abstract Taggable

Author: MrHell228

src/main/java/org/spongepowered/api/advancement/criteria/trigger/Trigger.java

@@ -35,9 +35,9 @@
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.advancement.CriterionEvent;
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.scoreboard.criteria.Criterion;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 import org.spongepowered.configurate.ConfigurationOptions;
@@ -55,7 +55,7 @@
  */
 @SuppressWarnings("unchecked")
 @CatalogedBy(Triggers.class)
-public interface Trigger<C extends FilteredTriggerConfiguration> extends Taggable<Trigger<?>> {
+public interface Trigger<C extends FilteredTriggerConfiguration> extends DefaultedRegistryValue<Trigger<?>> {
 
     /**
      * Creates a new {@link Builder} which can be used to create

src/main/java/org/spongepowered/api/adventure/ChatType.java

@@ -28,16 +28,16 @@
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * A type of chat
  */
 @CatalogedBy(ChatTypes.class)
-public interface ChatType extends Taggable<ChatType>, net.kyori.adventure.chat.ChatType, DataPackSerializable {
+public interface ChatType extends DefaultedRegistryValue<ChatType>, net.kyori.adventure.chat.ChatType, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link ChatType}.
@@ -48,11 +48,6 @@ static Builder builder() {
         return Sponge.game().builderProvider().provide(Builder.class);
     }
 
-    @Override
-    default DefaultedRegistryType<ChatType> registryType() {
-        return RegistryTypes.CHAT_TYPE;
-    }
-
     /**
      * Gets the translation key that would be used
      * to display the chat message.
@@ -69,6 +64,11 @@ default DefaultedRegistryType<ChatType> registryType() {
      */
     Style style();
 
+    @Override
+    default DefaultedRegistryType<ChatType> registryType() {
+        return RegistryTypes.CHAT_TYPE;
+    }
+
     /**
      * A builder to create {@link ChatType}s.
      */

src/main/java/org/spongepowered/api/block/BlockType.java

@@ -29,9 +29,9 @@
 import org.spongepowered.api.data.DataHolder;
 import org.spongepowered.api.item.ItemType;
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.state.StateContainer;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 import java.util.Optional;
@@ -45,7 +45,7 @@
  * via {@link BlockEntity}.</p>
  */
 @CatalogedBy(BlockTypes.class)
-public interface BlockType extends Taggable<BlockType>, ComponentLike, StateContainer<BlockState>, DataHolder.Immutable<BlockType> {
+public interface BlockType extends DefaultedRegistryValue<BlockType>, ComponentLike, StateContainer<BlockState>, DataHolder.Immutable<BlockType> {
 
     /**
      * Return the {@link ItemType} that represents this block.

src/main/java/org/spongepowered/api/block/entity/BlockEntityType.java

@@ -26,15 +26,15 @@
 
 import org.spongepowered.api.block.BlockState;
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Describes a type of block entity.
  */
 @CatalogedBy(BlockEntityTypes.class)
-public interface BlockEntityType extends Taggable<BlockEntityType> {
+public interface BlockEntityType extends DefaultedRegistryValue<BlockEntityType> {
 
     /**
      * Determines if the provided block is considered valid by the {@link BlockEntity}.

src/main/java/org/spongepowered/api/data/type/ArtType.java

@@ -29,26 +29,21 @@
 import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.entity.hanging.Painting;
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Represents a piece of art to be displayed by {@link Painting}s.
  */
 @CatalogedBy(ArtTypes.class)
-public interface ArtType extends Taggable<ArtType>, DataPackSerializable {
+public interface ArtType extends DefaultedRegistryValue<ArtType>, DataPackSerializable {
 
     static Builder builder() {
         return Sponge.game().builderProvider().provide(Builder.class);
     }
 
-    @Override
-    default DefaultedRegistryType<ArtType> registryType() {
-        return RegistryTypes.ART_TYPE;
-    }
-
     /**
      * Gets the height in blocks this art piece spans.
      *
@@ -63,6 +58,11 @@ default DefaultedRegistryType<ArtType> registryType() {
      */
     int width();
 
+    @Override
+    default DefaultedRegistryType<ArtType> registryType() {
+        return RegistryTypes.ART_TYPE;
+    }
+
     interface Builder extends org.spongepowered.api.util.Builder<ArtType, Builder>, CopyableBuilder<ArtType, Builder> {
 
         Builder dimensions(int width, int height);

src/main/java/org/spongepowered/api/data/type/BannerPatternShape.java

@@ -25,15 +25,15 @@
 package org.spongepowered.api.data.type;
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * A pattern shape which may be applied to a banner.
  */
 @CatalogedBy(BannerPatternShapes.class)
-public interface BannerPatternShape extends Taggable<BannerPatternShape> {
+public interface BannerPatternShape extends DefaultedRegistryValue<BannerPatternShape> {
 
     @Override
     default DefaultedRegistryType<BannerPatternShape> registryType() {

src/main/java/org/spongepowered/api/data/type/CatType.java

@@ -25,15 +25,15 @@
 package org.spongepowered.api.data.type;
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Represents the type of cat a cat is.
  */
 @CatalogedBy(CatTypes.class)
-public interface CatType extends Taggable<CatType> {
+public interface CatType extends DefaultedRegistryValue<CatType> {
 
     @Override
     default DefaultedRegistryType<CatType> registryType() {

src/main/java/org/spongepowered/api/data/type/FrogType.java

@@ -25,12 +25,12 @@
 package org.spongepowered.api.data.type;
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(FrogTypes.class)
-public interface FrogType extends Taggable<FrogType> {
+public interface FrogType extends DefaultedRegistryValue<FrogType> {
 
     @Override
     default DefaultedRegistryType<FrogType> registryType() {

src/main/java/org/spongepowered/api/data/type/ProfessionType.java

@@ -26,16 +26,16 @@
 
 import org.spongepowered.api.entity.living.trader.Villager;
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Represents a {@link Villager} profession. A profession defines the genre of
  * trade offers a trader may offer to a player.
  */
 @CatalogedBy(ProfessionTypes.class)
-public interface ProfessionType extends Taggable<ProfessionType> {
+public interface ProfessionType extends DefaultedRegistryValue<ProfessionType> {
 
     @Override
     default DefaultedRegistryType<ProfessionType> registryType() {

src/main/java/org/spongepowered/api/data/type/VillagerType.java

@@ -25,12 +25,12 @@
 package org.spongepowered.api.data.type;
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(VillagerTypes.class)
-public interface VillagerType extends Taggable<VillagerType> {
+public interface VillagerType extends DefaultedRegistryValue<VillagerType> {
 
     @Override
     default DefaultedRegistryType<VillagerType> registryType() {