make vanilla registry values Taggable

Author: MrHell228

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

@@ -34,8 +34,10 @@
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.advancement.CriterionEvent;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+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.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 import org.spongepowered.configurate.ConfigurationOptions;
@@ -53,7 +55,7 @@
  */
 @SuppressWarnings("unchecked")
 @CatalogedBy(Triggers.class)
-public interface Trigger<C extends FilteredTriggerConfiguration> extends DefaultedRegistryValue {
+public interface Trigger<C extends FilteredTriggerConfiguration> extends DefaultedTaggable<Trigger<?>> {
 
     /**
      * Creates a new {@link Builder} which can be used to create
@@ -96,6 +98,11 @@ static Builder<?> builder() {
      */
     void trigger(ServerPlayer player);
 
+    @Override
+    default DefaultedRegistryType<Trigger<?>> registryType() {
+        return RegistryTypes.TRIGGER;
+    }
+
     /**
      * A builder to create {@link Trigger}s.
      *

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

@@ -27,15 +27,17 @@
 import net.kyori.adventure.text.format.Style;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.datapack.DataPackSerializable;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
+import org.spongepowered.api.tag.DefaultedTaggable;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * A type of chat
  */
 @CatalogedBy(ChatTypes.class)
-public interface ChatType extends DefaultedRegistryValue, net.kyori.adventure.chat.ChatType, DataPackSerializable {
+public interface ChatType extends DefaultedTaggable<ChatType>, net.kyori.adventure.chat.ChatType, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link ChatType}.
@@ -46,6 +48,11 @@ 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.

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

@@ -25,14 +25,16 @@
 package org.spongepowered.api.block.entity;
 
 import org.spongepowered.api.block.BlockState;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
+import org.spongepowered.api.tag.DefaultedTaggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Describes a type of block entity.
  */
 @CatalogedBy(BlockEntityTypes.class)
-public interface BlockEntityType extends DefaultedRegistryValue {
+public interface BlockEntityType extends DefaultedTaggable<BlockEntityType> {
 
     /**
      * Determines if the provided block is considered valid by the {@link BlockEntity}.
@@ -46,4 +48,9 @@ public interface BlockEntityType extends DefaultedRegistryValue {
      * @return True if valid, false if not
      */
     boolean isValidBlock(BlockState block);
+
+    @Override
+    default DefaultedRegistryType<BlockEntityType> registryType() {
+        return RegistryTypes.BLOCK_ENTITY_TYPE;
+    }
 }

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

@@ -28,21 +28,27 @@
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.entity.hanging.Painting;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
-import org.spongepowered.api.util.Builder;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
+import org.spongepowered.api.tag.DefaultedTaggable;
 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 DefaultedRegistryValue, DataPackSerializable {
+public interface ArtType extends DefaultedTaggable<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.
      *

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

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

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

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

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

@@ -25,14 +25,20 @@
 package org.spongepowered.api.data.type;
 
 import org.spongepowered.api.entity.living.trader.Villager;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
+import org.spongepowered.api.tag.DefaultedTaggable;
 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 DefaultedRegistryValue {
+public interface ProfessionType extends DefaultedTaggable<ProfessionType> {
 
+    @Override
+    default DefaultedRegistryType<ProfessionType> registryType() {
+        return RegistryTypes.PROFESSION_TYPE;
+    }
 }

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

@@ -24,10 +24,16 @@
  */
 package org.spongepowered.api.data.type;
 
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
+import org.spongepowered.api.tag.DefaultedTaggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(VillagerTypes.class)
-public interface VillagerType extends DefaultedRegistryValue {
+public interface VillagerType extends DefaultedTaggable<VillagerType> {
 
+    @Override
+    default DefaultedRegistryType<VillagerType> registryType() {
+        return RegistryTypes.VILLAGER_TYPE;
+    }
 }

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

@@ -24,10 +24,16 @@
  */
 package org.spongepowered.api.data.type;
 
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
+import org.spongepowered.api.tag.DefaultedTaggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(WolfVariants.class)
-public interface WolfVariant extends DefaultedRegistryValue {
+public interface WolfVariant extends DefaultedTaggable<WolfVariant> {
 
+    @Override
+    default DefaultedRegistryType<WolfVariant> registryType() {
+        return RegistryTypes.WOLF_VARIANT;
+    }
 }

src/main/java/org/spongepowered/api/effect/particle/ParticleType.java

@@ -24,7 +24,9 @@
  */
 package org.spongepowered.api.effect.particle;
 
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
+import org.spongepowered.api.tag.DefaultedTaggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 import java.util.Map;
@@ -35,7 +37,7 @@
  * Represents a particle that can be sent on a Minecraft client.
  */
 @CatalogedBy(ParticleTypes.class)
-public interface ParticleType extends DefaultedRegistryValue {
+public interface ParticleType extends DefaultedTaggable<ParticleType> {
 
     /**
      * Gets the default value for the specified {@link ParticleOption}, it may
@@ -71,4 +73,8 @@ default <V> Optional<V> defaultOption(Supplier<? extends ParticleOption<V>> opti
      */
     Map<ParticleOption<?>, Object> defaultOptions();
 
+    @Override
+    default DefaultedRegistryType<ParticleType> registryType() {
+        return RegistryTypes.PARTICLE_TYPE;
+    }
 }