remove Taggable, rename DefaultedTaggable to Taggable

Author: MrHell228

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

@@ -37,7 +37,7 @@
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.scoreboard.criteria.Criterion;
-import org.spongepowered.api.tag.DefaultedTaggable;
+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 DefaultedTaggable<Trigger<?>> {
+public interface Trigger<C extends FilteredTriggerConfiguration> extends Taggable<Trigger<?>> {
 
     /**
      * Creates a new {@link Builder} which can be used to create

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

@@ -29,15 +29,15 @@
 import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.DefaultedTaggable;
+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 DefaultedTaggable<ChatType>, net.kyori.adventure.chat.ChatType, DataPackSerializable {
+public interface ChatType extends Taggable<ChatType>, net.kyori.adventure.chat.ChatType, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link ChatType}.

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

@@ -31,7 +31,7 @@
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.state.StateContainer;
-import org.spongepowered.api.tag.DefaultedTaggable;
+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 DefaultedTaggable<BlockType>, ComponentLike, StateContainer<BlockState>, DataHolder.Immutable<BlockType> {
+public interface BlockType extends Taggable<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

@@ -27,14 +27,14 @@
 import org.spongepowered.api.block.BlockState;
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.DefaultedTaggable;
+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 DefaultedTaggable<BlockEntityType> {
+public interface BlockEntityType extends Taggable<BlockEntityType> {
 
     /**
      * Determines if the provided block is considered valid by the {@link BlockEntity}.

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

@@ -30,15 +30,15 @@
 import org.spongepowered.api.entity.hanging.Painting;
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.DefaultedTaggable;
+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 DefaultedTaggable<ArtType>, DataPackSerializable {
+public interface ArtType extends Taggable<ArtType>, DataPackSerializable {
 
     static Builder builder() {
         return Sponge.game().builderProvider().provide(Builder.class);

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

@@ -26,14 +26,14 @@
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.DefaultedTaggable;
+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 DefaultedTaggable<BannerPatternShape> {
+public interface BannerPatternShape extends Taggable<BannerPatternShape> {
 
     @Override
     default DefaultedRegistryType<BannerPatternShape> registryType() {

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

@@ -26,14 +26,14 @@
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.DefaultedTaggable;
+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 DefaultedTaggable<CatType> {
+public interface CatType extends Taggable<CatType> {
 
     @Override
     default DefaultedRegistryType<CatType> registryType() {

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

@@ -26,11 +26,11 @@
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.DefaultedTaggable;
+import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(FrogTypes.class)
-public interface FrogType extends DefaultedTaggable<FrogType> {
+public interface FrogType extends Taggable<FrogType> {
 
     @Override
     default DefaultedRegistryType<FrogType> registryType() {

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

@@ -27,15 +27,15 @@
 import org.spongepowered.api.entity.living.trader.Villager;
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.DefaultedTaggable;
+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 DefaultedTaggable<ProfessionType> {
+public interface ProfessionType extends Taggable<ProfessionType> {
 
     @Override
     default DefaultedRegistryType<ProfessionType> registryType() {

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

@@ -26,11 +26,11 @@
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.RegistryTypes;
-import org.spongepowered.api.tag.DefaultedTaggable;
+import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(VillagerTypes.class)
-public interface VillagerType extends DefaultedTaggable<VillagerType> {
+public interface VillagerType extends Taggable<VillagerType> {
 
     @Override
     default DefaultedRegistryType<VillagerType> registryType() {