update old Taggable types

MrHell228 · MrHell228 · commit 1c1c56078922 · 2025-04-01T18:20:59.000+03:00
diff --git a/src/main/java/org/spongepowered/api/block/BlockType.java b/src/main/java/org/spongepowered/api/block/BlockType.java
@@ -28,9 +28,10 @@
 import org.spongepowered.api.block.entity.BlockEntity;
 import org.spongepowered.api.data.DataHolder;
 import org.spongepowered.api.item.ItemType;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.state.StateContainer;
-import org.spongepowered.api.tag.Taggable;
+import org.spongepowered.api.tag.DefaultedTaggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 import java.util.Optional;
@@ -44,7 +45,7 @@
  * via {@link BlockEntity}.</p>
  */
 @CatalogedBy(BlockTypes.class)
-public interface BlockType extends DefaultedRegistryValue, ComponentLike, StateContainer<BlockState>, DataHolder.Immutable<BlockType>, Taggable<BlockType> {
+public interface BlockType extends DefaultedTaggable<BlockType>, ComponentLike, StateContainer<BlockState>, DataHolder.Immutable<BlockType> {
 
     /**
      * Return the {@link ItemType} that represents this block.
@@ -104,4 +105,8 @@ public interface BlockType extends DefaultedRegistryValue, ComponentLike, StateC
      */
     boolean hasBlockEntity();
 
+    @Override
+    default DefaultedRegistryType<BlockType> registryType() {
+        return RegistryTypes.BLOCK_TYPE;
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/entity/EntityType.java b/src/main/java/org/spongepowered/api/entity/EntityType.java
@@ -26,15 +26,16 @@
 
 import net.kyori.adventure.text.ComponentLike;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
-import org.spongepowered.api.tag.Taggable;
+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 entity.
  */
 @CatalogedBy(EntityTypes.class)
-public interface EntityType<A extends Entity> extends DefaultedRegistryValue, ComponentLike, Taggable<EntityType<?>> {
+public interface EntityType<A extends Entity> extends DefaultedTaggable<EntityType<? extends Entity>>, ComponentLike {
 
     /**
      * If true {@link Entity entities} of this type will not be saved to disk.
@@ -70,4 +71,9 @@ public interface EntityType<A extends Entity> extends DefaultedRegistryValue, Co
      * @return The category of this type
      */
     EntityCategory category();
+
+    @Override
+    default DefaultedRegistryType<EntityType<? extends Entity>> registryType() {
+        return RegistryTypes.ENTITY_TYPE;
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageType.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageType.java
@@ -28,9 +28,10 @@
 import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.event.cause.entity.damage.source.DamageSource;
-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.tag.Tag;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.Nameable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
@@ -42,7 +43,7 @@
  * can damage an {@link Entity} with varying {@link DamageType}s depending on the circumstances.
  */
 @CatalogedBy(DamageTypes.class)
-public interface DamageType extends DefaultedRegistryValue, Nameable, Taggable<DamageType>, DataPackSerializable {
+public interface DamageType extends DefaultedTaggable<DamageType>, Nameable, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link DamageType}.
@@ -88,6 +89,11 @@ static Builder builder() {
      */
     DamageEffect effect();
 
+    @Override
+    default DefaultedRegistryType<DamageType> registryType() {
+        return RegistryTypes.DAMAGE_TYPE;
+    }
+
     /**
      * A builder to create {@link DamageType}s.
      */
diff --git a/src/main/java/org/spongepowered/api/fluid/FluidType.java b/src/main/java/org/spongepowered/api/fluid/FluidType.java
@@ -30,9 +30,10 @@
 import org.spongepowered.api.data.DataHolder;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.item.ItemType;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.DefaultedRegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.state.StateContainer;
-import org.spongepowered.api.tag.Taggable;
+import org.spongepowered.api.tag.DefaultedTaggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
@@ -48,6 +49,10 @@
  * than how vanilla implementations handle them.</p>
  */
 @CatalogedBy(FluidTypes.class)
-public interface FluidType extends DefaultedRegistryValue, StateContainer<FluidState>, DataHolder.Immutable<FluidType>, Taggable<FluidType> {
+public interface FluidType extends DefaultedTaggable<FluidType>, StateContainer<FluidState>, DataHolder.Immutable<FluidType> {
 
+    @Override
+    default DefaultedRegistryType<FluidType> registryType() {
+        return RegistryTypes.FLUID_TYPE;
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/item/ItemType.java b/src/main/java/org/spongepowered/api/item/ItemType.java
@@ -28,8 +28,9 @@
 import org.spongepowered.api.block.BlockType;
 import org.spongepowered.api.data.DataHolder;
 import org.spongepowered.api.item.inventory.ItemStack;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
-import org.spongepowered.api.tag.Taggable;
+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.Optional;
@@ -39,7 +40,7 @@
  * A type of item.
  */
 @CatalogedBy(ItemTypes.class)
-public interface ItemType extends DefaultedRegistryValue, ComponentLike, DataHolder.Immutable<ItemType>, Taggable<ItemType> {
+public interface ItemType extends DefaultedTaggable<ItemType>, ComponentLike, DataHolder.Immutable<ItemType> {
 
     /**
      * Gets the corresponding {@link BlockType} of this item if one exists.
@@ -89,4 +90,9 @@ public interface ItemType extends DefaultedRegistryValue, ComponentLike, DataHol
      * @return true if this type is any of the given item types
      */
     boolean isAnyOf(ItemType... types);
+
+    @Override
+    default DefaultedRegistryType<ItemType> registryType() {
+        return RegistryTypes.ITEM_TYPE;
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java
@@ -27,16 +27,17 @@
 import net.kyori.adventure.text.ComponentLike;
 import org.spongepowered.api.block.entity.EnchantmentTable;
 import org.spongepowered.api.item.inventory.ItemStackLike;
-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.tag.EnchantmenTypeTags;
-import org.spongepowered.api.tag.Taggable;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Represents a modifier on an item that has various effects.
  */
 @CatalogedBy(EnchantmentTypes.class)
-public interface EnchantmentType extends DefaultedRegistryValue, ComponentLike, Taggable<EnchantmentType> {
+public interface EnchantmentType extends DefaultedTaggable<EnchantmentType>, ComponentLike {
 
     /**
      * Gets the weight of this enchantment type.
@@ -130,4 +131,8 @@ default boolean isCurse() {
         return this.is(EnchantmenTypeTags.CURSE);
     }
 
+    @Override
+    default DefaultedRegistryType<EnchantmentType> registryType() {
+        return RegistryTypes.ENCHANTMENT_TYPE;
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/world/biome/Biome.java b/src/main/java/org/spongepowered/api/world/biome/Biome.java
@@ -35,9 +35,9 @@
 import org.spongepowered.api.entity.EntityCategory;
 import org.spongepowered.api.entity.EntityType;
 import org.spongepowered.api.entity.living.golem.SnowGolem;
-import org.spongepowered.api.registry.DefaultedRegistryValue;
-import org.spongepowered.api.tag.Taggable;
-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.Color;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
@@ -60,7 +60,7 @@
  * Represents a biome.
  */
 @CatalogedBy(Biomes.class)
-public interface Biome extends DefaultedRegistryValue, DataHolder, Taggable<Biome>, DataPackSerializable {
+public interface Biome extends DefaultedTaggable<Biome>, DataHolder, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link Biome}.
@@ -286,6 +286,11 @@ default Optional<SoundConfig.BackgroundMusic> backgroundMusic() {
         return this.get(Keys.BACKGROUND_MUSIC);
     }
 
+    @Override
+    default DefaultedRegistryType<Biome> registryType() {
+        return RegistryTypes.BIOME;
+    }
+
     /**
      * A builder to create {@link Biome}s.
      */
