Add missing Taggable types

Author: MrHell228

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

@@ -24,8 +24,16 @@
  */
 package org.spongepowered.api.data.type;
 
+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(FrogTypes.class)
-public interface FrogType {
+public interface FrogType extends DefaultedTaggable<FrogType> {
+
+    @Override
+    default DefaultedRegistryType<FrogType> registryType() {
+        return RegistryTypes.FROG_TYPE;
+    }
 }

src/main/java/org/spongepowered/api/effect/sound/SoundType.java

@@ -27,14 +27,17 @@
 import net.kyori.adventure.sound.Sound;
 import org.spongepowered.api.ResourceKeyed;
 import org.spongepowered.api.Sponge;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
+import org.spongepowered.api.tag.DefaultedTaggable;
 import org.spongepowered.api.util.ResourceKeyedBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Represents a sound that can be heard on clients.
  */
 @CatalogedBy(SoundTypes.class)
-public interface SoundType extends ResourceKeyed, Sound.Type {
+public interface SoundType extends DefaultedTaggable<SoundType>, ResourceKeyed, Sound.Type {
 
     /**
      * Creates a new {@link Builder} for building SoundTypes.
@@ -45,6 +48,11 @@ static Builder builder() {
         return Sponge.game().builderProvider().provide(Builder.class);
     }
 
+    @Override
+    default DefaultedRegistryType<SoundType> registryType() {
+        return RegistryTypes.SOUND_TYPE;
+    }
+
     /**
      * Builds a SoundType, primarily for sending custom sounds to the client.
      */

src/main/java/org/spongepowered/api/statistic/Statistic.java

@@ -24,7 +24,10 @@
  */
 package org.spongepowered.api.statistic;
 
+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.annotation.CatalogedBy;
 
 import java.text.NumberFormat;
@@ -34,7 +37,7 @@
  * Represents some statistic in minecraft.
  */
 @CatalogedBy(Statistics.class)
-public interface Statistic {
+public interface Statistic extends DefaultedTaggable<Statistic> {
 
     /**
      * Returns the objective {@link Criterion} for this statistic.
@@ -51,6 +54,11 @@ public interface Statistic {
      */
     NumberFormat format();
 
+    @Override
+    default DefaultedRegistryType<Statistic> registryType() {
+        return RegistryTypes.STATISTIC;
+    }
+
     /**
      * Represents a {@link Statistic} instance of a {@link StatisticCategory.Typed}.
      *

src/main/java/org/spongepowered/api/statistic/StatisticCategory.java

@@ -25,12 +25,15 @@
 package org.spongepowered.api.statistic;
 
 import io.leangen.geantyref.TypeToken;
+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.Collection;
 
 @CatalogedBy(StatisticCategories.class)
-public interface StatisticCategory {
+public interface StatisticCategory extends DefaultedTaggable<StatisticCategory> {
 
     /**
      * Gets all the {@link Statistic}s that are listed
@@ -40,6 +43,11 @@ public interface StatisticCategory {
      */
     Collection<? extends Statistic> statistics();
 
+    @Override
+    default DefaultedRegistryType<StatisticCategory> registryType() {
+        return RegistryTypes.STATISTIC_CATEGORY;
+    }
+
     /**
      * Represents a {@link StatisticCategory} that owns
      * {@link Statistic}s for all the {@link T values}

src/main/java/org/spongepowered/api/world/generation/carver/CarverType.java

@@ -25,13 +25,16 @@
 package org.spongepowered.api.world.generation.carver;
 
 import org.spongepowered.api.data.persistence.DataView;
+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 type of {@link Carver}.
  */
 @CatalogedBy(CarverTypes.class)
-public interface CarverType {
+public interface CarverType extends DefaultedTaggable<CarverType> {
 
     /**
      * Returns the configured carver
@@ -40,4 +43,9 @@ public interface CarverType {
      * @return The configured carver
      */
     Carver configure(DataView config) throws IllegalArgumentException;
+
+    @Override
+    default DefaultedRegistryType<CarverType> registryType() {
+        return RegistryTypes.CARVER_TYPE;
+    }
 }

src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierType.java

@@ -25,13 +25,16 @@
 package org.spongepowered.api.world.generation.feature;
 
 import org.spongepowered.api.data.persistence.DataView;
+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 type of {@link PlacementModifier}.
  */
 @CatalogedBy(PlacementModifierTypes.class)
-public interface PlacementModifierType {
+public interface PlacementModifierType extends DefaultedTaggable<PlacementModifierType> {
 
     /**
      * Returns the placement modifier.
@@ -42,4 +45,9 @@ public interface PlacementModifierType {
      * @throws IllegalArgumentException when the configuration is not valid for this type of placement modifier
      */
     PlacementModifier configure(DataView config) throws IllegalArgumentException;
+
+    @Override
+    default DefaultedRegistryType<PlacementModifierType> registryType() {
+        return RegistryTypes.PLACEMENT_MODIFIER;
+    }
 }

src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorType.java

@@ -25,6 +25,9 @@
 package org.spongepowered.api.world.generation.structure.jigsaw;
 
 import org.spongepowered.api.data.persistence.DataView;
+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.io.IOException;
@@ -33,7 +36,7 @@
  * A type of {@link Processor}.
  */
 @CatalogedBy(ProcessorTypes.class)
-public interface ProcessorType {
+public interface ProcessorType extends DefaultedTaggable<ProcessorType> {
 
     /**
      * Returns the configured processor.
@@ -42,4 +45,9 @@ public interface ProcessorType {
      * @return The configured processor
      */
     Processor configure(DataView config) throws IOException;
+
+    @Override
+    default DefaultedRegistryType<ProcessorType> registryType() {
+        return RegistryTypes.PROCESSOR_TYPE;
+    }
 }