From b4874890c2a6ba50ed1a62e612cc186dc6dd4d5f Mon Sep 17 00:00:00 2001
From: MrHell228 <artemkz2016@gmail.com>
Date: Sun, 6 Apr 2025 00:14:20 +0300
Subject: [PATCH 1/6] make DefaultedRegistryValue generic

---
 .../api/registry/DefaultedRegistryValue.java              | 8 ++++----
 src/main/java/org/spongepowered/api/tag/Taggable.java     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/spongepowered/api/registry/DefaultedRegistryValue.java b/src/main/java/org/spongepowered/api/registry/DefaultedRegistryValue.java
index 8ac7b5036ea..d7c9c5fac86 100644
--- a/src/main/java/org/spongepowered/api/registry/DefaultedRegistryValue.java
+++ b/src/main/java/org/spongepowered/api/registry/DefaultedRegistryValue.java
@@ -34,17 +34,17 @@
  * within a {@link DefaultedRegistryType defaulted registry}.
  */
 @SuppressWarnings("unchecked")
-public interface DefaultedRegistryValue {
+public interface DefaultedRegistryValue<T extends DefaultedRegistryValue<T>> {
 
-    default <T> ResourceKey key(final DefaultedRegistryType<T> type) {
+    default ResourceKey key(final DefaultedRegistryType<T> type) {
         return Objects.requireNonNull(type, "type").get().valueKey((T) this);
     }
 
-    default <T> Optional<ResourceKey> findKey(final DefaultedRegistryType<T> type) {
+    default Optional<ResourceKey> findKey(final DefaultedRegistryType<T> type) {
         return Objects.requireNonNull(type, "type").find().flatMap(r -> r.findValueKey((T) this));
     }
 
-    default <T> DefaultedRegistryReference<T> asDefaultedReference(final DefaultedRegistryType<T> type) {
+    default DefaultedRegistryReference<T> asDefaultedReference(final DefaultedRegistryType<T> type) {
         return RegistryKey.of(Objects.requireNonNull(type, "type"), this.key(type)).asDefaultedReference(type.defaultHolder());
     }
 }
diff --git a/src/main/java/org/spongepowered/api/tag/Taggable.java b/src/main/java/org/spongepowered/api/tag/Taggable.java
index 716e2042175..49ce58c17e8 100644
--- a/src/main/java/org/spongepowered/api/tag/Taggable.java
+++ b/src/main/java/org/spongepowered/api/tag/Taggable.java
@@ -33,7 +33,7 @@
 /**
  * A type that may be included in one or more {@link Tag} collections.
  */
-public interface Taggable<T extends Taggable<T>> extends DefaultedRegistryValue {
+public interface Taggable<T extends Taggable<T>> extends DefaultedRegistryValue<T> {
 
     /**
      * Gets the {@link RegistryType} that holds the types of {@link Tag tags}

From e917590ab96f141600f79a9822a88e675f1f963d Mon Sep 17 00:00:00 2001
From: MrHell228 <artemkz2016@gmail.com>
Date: Sun, 6 Apr 2025 01:48:09 +0300
Subject: [PATCH 2/6] update DefaultedRegistryValues types to use parameter

---
 .../java/org/spongepowered/api/advancement/Advancement.java     | 2 +-
 .../java/org/spongepowered/api/advancement/AdvancementType.java | 2 +-
 .../spongepowered/api/advancement/criteria/trigger/Trigger.java | 2 +-
 src/main/java/org/spongepowered/api/adventure/ChatType.java     | 2 +-
 src/main/java/org/spongepowered/api/block/BlockType.java        | 2 +-
 .../org/spongepowered/api/block/entity/BlockEntityType.java     | 2 +-
 .../java/org/spongepowered/api/block/transaction/Operation.java | 2 +-
 .../api/command/parameter/managed/ValueParameter.java           | 2 +-
 .../managed/clientcompletion/ClientCompletionType.java          | 2 +-
 .../api/command/registrar/CommandRegistrarType.java             | 2 +-
 .../api/command/registrar/tree/CommandTreeNodeType.java         | 2 +-
 .../api/command/selector/SelectorSortAlgorithm.java             | 2 +-
 .../org/spongepowered/api/command/selector/SelectorType.java    | 2 +-
 .../java/org/spongepowered/api/data/persistence/DataFormat.java | 2 +-
 .../java/org/spongepowered/api/data/type/ArmorMaterial.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/ArtType.java      | 2 +-
 .../java/org/spongepowered/api/data/type/AttachmentSurface.java | 2 +-
 .../java/org/spongepowered/api/data/type/AxolotlVariant.java    | 2 +-
 .../java/org/spongepowered/api/data/type/BambooLeavesType.java  | 2 +-
 .../org/spongepowered/api/data/type/BannerPatternShape.java     | 2 +-
 .../org/spongepowered/api/data/type/BellAttachmentType.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/BoatType.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/BodyPart.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/CatType.java      | 2 +-
 .../org/spongepowered/api/data/type/ChestAttachmentType.java    | 2 +-
 .../java/org/spongepowered/api/data/type/ComparatorMode.java    | 2 +-
 src/main/java/org/spongepowered/api/data/type/DoorHinge.java    | 2 +-
 .../java/org/spongepowered/api/data/type/DripstoneSegment.java  | 2 +-
 src/main/java/org/spongepowered/api/data/type/DyeColor.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/FoxType.java      | 2 +-
 .../java/org/spongepowered/api/data/type/HandPreference.java    | 2 +-
 src/main/java/org/spongepowered/api/data/type/HandType.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/HorseColor.java   | 2 +-
 src/main/java/org/spongepowered/api/data/type/HorseStyle.java   | 2 +-
 .../java/org/spongepowered/api/data/type/InstrumentType.java    | 2 +-
 src/main/java/org/spongepowered/api/data/type/ItemTier.java     | 2 +-
 .../org/spongepowered/api/data/type/JigsawBlockOrientation.java | 2 +-
 src/main/java/org/spongepowered/api/data/type/LlamaType.java    | 2 +-
 src/main/java/org/spongepowered/api/data/type/MatterType.java   | 2 +-
 .../java/org/spongepowered/api/data/type/MooshroomType.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/NotePitch.java    | 2 +-
 src/main/java/org/spongepowered/api/data/type/PandaGene.java    | 2 +-
 src/main/java/org/spongepowered/api/data/type/ParrotType.java   | 2 +-
 src/main/java/org/spongepowered/api/data/type/PhantomPhase.java | 2 +-
 src/main/java/org/spongepowered/api/data/type/PickupRule.java   | 2 +-
 src/main/java/org/spongepowered/api/data/type/PistonType.java   | 2 +-
 src/main/java/org/spongepowered/api/data/type/PortionType.java  | 2 +-
 .../java/org/spongepowered/api/data/type/ProfessionType.java    | 2 +-
 src/main/java/org/spongepowered/api/data/type/RabbitType.java   | 2 +-
 src/main/java/org/spongepowered/api/data/type/RaidStatus.java   | 2 +-
 .../java/org/spongepowered/api/data/type/RailDirection.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/SalmonSize.java   | 2 +-
 .../java/org/spongepowered/api/data/type/SculkSensorState.java  | 2 +-
 src/main/java/org/spongepowered/api/data/type/SkinPart.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/SlabPortion.java  | 2 +-
 src/main/java/org/spongepowered/api/data/type/SpellType.java    | 2 +-
 src/main/java/org/spongepowered/api/data/type/StairShape.java   | 2 +-
 .../java/org/spongepowered/api/data/type/StructureMode.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/Tilt.java         | 2 +-
 .../java/org/spongepowered/api/data/type/TropicalFishShape.java | 2 +-
 src/main/java/org/spongepowered/api/data/type/VillagerType.java | 2 +-
 .../org/spongepowered/api/data/type/WallConnectionState.java    | 2 +-
 .../org/spongepowered/api/data/type/WireAttachmentType.java     | 2 +-
 src/main/java/org/spongepowered/api/data/type/WolfVariant.java  | 2 +-
 .../org/spongepowered/api/effect/particle/ParticleOption.java   | 2 +-
 .../org/spongepowered/api/effect/particle/ParticleType.java     | 2 +-
 .../org/spongepowered/api/effect/potion/PotionEffectType.java   | 2 +-
 .../org/spongepowered/api/effect/sound/music/MusicDisc.java     | 2 +-
 src/main/java/org/spongepowered/api/entity/EntityCategory.java  | 2 +-
 src/main/java/org/spongepowered/api/entity/EntityType.java      | 2 +-
 .../org/spongepowered/api/entity/ai/goal/GoalExecutorType.java  | 2 +-
 .../java/org/spongepowered/api/entity/ai/goal/GoalType.java     | 2 +-
 .../spongepowered/api/entity/attribute/AttributeOperation.java  | 2 +-
 .../spongepowered/api/entity/attribute/type/AttributeType.java  | 2 +-
 .../org/spongepowered/api/entity/display/BillboardType.java     | 2 +-
 .../org/spongepowered/api/entity/display/ItemDisplayType.java   | 2 +-
 .../org/spongepowered/api/entity/display/TextAlignment.java     | 2 +-
 .../living/monster/boss/dragon/phase/DragonPhaseType.java       | 2 +-
 .../api/entity/living/player/chat/ChatVisibility.java           | 2 +-
 .../api/entity/living/player/gamemode/GameMode.java             | 2 +-
 .../org/spongepowered/api/event/cause/entity/DismountType.java  | 2 +-
 .../org/spongepowered/api/event/cause/entity/MovementType.java  | 2 +-
 .../org/spongepowered/api/event/cause/entity/SpawnType.java     | 2 +-
 .../api/event/cause/entity/damage/DamageEffect.java             | 2 +-
 .../api/event/cause/entity/damage/DamageModifierType.java       | 2 +-
 .../api/event/cause/entity/damage/DamageScaling.java            | 2 +-
 .../spongepowered/api/event/cause/entity/damage/DamageType.java | 2 +-
 src/main/java/org/spongepowered/api/fluid/FluidType.java        | 2 +-
 src/main/java/org/spongepowered/api/item/FireworkShape.java     | 2 +-
 src/main/java/org/spongepowered/api/item/ItemType.java          | 2 +-
 .../org/spongepowered/api/item/enchantment/EnchantmentType.java | 2 +-
 .../org/spongepowered/api/item/inventory/ContainerType.java     | 2 +-
 .../api/item/inventory/equipment/EquipmentGroup.java            | 2 +-
 .../api/item/inventory/equipment/EquipmentType.java             | 2 +-
 .../org/spongepowered/api/item/inventory/menu/ClickType.java    | 2 +-
 .../org/spongepowered/api/item/inventory/query/QueryType.java   | 2 +-
 src/main/java/org/spongepowered/api/item/potion/PotionType.java | 2 +-
 src/main/java/org/spongepowered/api/item/recipe/Recipe.java     | 2 +-
 src/main/java/org/spongepowered/api/item/recipe/RecipeType.java | 2 +-
 .../spongepowered/api/item/recipe/smithing/TrimMaterial.java    | 2 +-
 .../org/spongepowered/api/item/recipe/smithing/TrimPattern.java | 2 +-
 src/main/java/org/spongepowered/api/map/color/MapColorType.java | 2 +-
 src/main/java/org/spongepowered/api/map/color/MapShade.java     | 2 +-
 .../org/spongepowered/api/map/decoration/MapDecorationType.java | 2 +-
 .../map/decoration/orientation/MapDecorationOrientation.java    | 2 +-
 .../org/spongepowered/api/placeholder/PlaceholderParser.java    | 2 +-
 src/main/java/org/spongepowered/api/scheduler/TaskPriority.java | 2 +-
 .../java/org/spongepowered/api/scoreboard/CollisionRule.java    | 2 +-
 src/main/java/org/spongepowered/api/scoreboard/Visibility.java  | 2 +-
 .../org/spongepowered/api/scoreboard/criteria/Criterion.java    | 2 +-
 .../spongepowered/api/scoreboard/displayslot/DisplaySlot.java   | 2 +-
 .../scoreboard/objective/displaymode/ObjectiveDisplayMode.java  | 2 +-
 src/main/java/org/spongepowered/api/service/ban/BanType.java    | 2 +-
 .../java/org/spongepowered/api/service/economy/Currency.java    | 2 +-
 .../api/service/economy/account/AccountDeletionResultType.java  | 2 +-
 .../api/service/economy/transaction/TransactionType.java        | 2 +-
 src/main/java/org/spongepowered/api/util/mirror/Mirror.java     | 2 +-
 .../org/spongepowered/api/util/orientation/Orientation.java     | 2 +-
 src/main/java/org/spongepowered/api/util/rotation/Rotation.java | 2 +-
 .../java/org/spongepowered/api/world/ChunkRegenerateFlag.java   | 2 +-
 src/main/java/org/spongepowered/api/world/HeightType.java       | 2 +-
 src/main/java/org/spongepowered/api/world/LightType.java        | 2 +-
 src/main/java/org/spongepowered/api/world/WorldType.java        | 2 +-
 src/main/java/org/spongepowered/api/world/biome/Biome.java      | 2 +-
 src/main/java/org/spongepowered/api/world/chunk/ChunkState.java | 2 +-
 .../java/org/spongepowered/api/world/difficulty/Difficulty.java | 2 +-
 .../java/org/spongepowered/api/world/gamerule/GameRule.java     | 2 +-
 .../org/spongepowered/api/world/generation/carver/Carver.java   | 2 +-
 .../api/world/generation/config/noise/DensityFunction.java      | 2 +-
 .../spongepowered/api/world/generation/config/noise/Noise.java  | 2 +-
 .../api/world/generation/config/noise/NoiseGeneratorConfig.java | 2 +-
 .../org/spongepowered/api/world/generation/feature/Feature.java | 2 +-
 .../spongepowered/api/world/generation/feature/FeatureType.java | 2 +-
 .../api/world/generation/feature/PlacedFeature.java             | 2 +-
 .../spongepowered/api/world/generation/structure/Structure.java | 2 +-
 .../api/world/generation/structure/StructureSet.java            | 2 +-
 .../api/world/generation/structure/StructureType.java           | 2 +-
 .../api/world/generation/structure/jigsaw/JigsawPool.java       | 2 +-
 .../api/world/generation/structure/jigsaw/ProcessorList.java    | 2 +-
 .../java/org/spongepowered/api/world/schematic/PaletteType.java | 2 +-
 .../org/spongepowered/api/world/server/WorldArchetypeType.java  | 2 +-
 .../spongepowered/api/world/teleport/TeleportHelperFilter.java  | 2 +-
 .../java/org/spongepowered/api/world/weather/WeatherType.java   | 2 +-
 143 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/src/main/java/org/spongepowered/api/advancement/Advancement.java b/src/main/java/org/spongepowered/api/advancement/Advancement.java
index 78391ecd5af..6a45e29c0ec 100644
--- a/src/main/java/org/spongepowered/api/advancement/Advancement.java
+++ b/src/main/java/org/spongepowered/api/advancement/Advancement.java
@@ -40,7 +40,7 @@
 /**
  * An advancement.
  */
-public interface Advancement extends DefaultedRegistryValue, ComponentLike, DataPackSerializable {
+public interface Advancement extends DefaultedRegistryValue<Advancement>, ComponentLike, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create an {@link Advancement}.
diff --git a/src/main/java/org/spongepowered/api/advancement/AdvancementType.java b/src/main/java/org/spongepowered/api/advancement/AdvancementType.java
index b1d387fcbbf..79e9369ded6 100644
--- a/src/main/java/org/spongepowered/api/advancement/AdvancementType.java
+++ b/src/main/java/org/spongepowered/api/advancement/AdvancementType.java
@@ -33,7 +33,7 @@
  * also the appearance in the notifications.
  */
 @CatalogedBy(AdvancementTypes.class)
-public interface AdvancementType extends DefaultedRegistryValue {
+public interface AdvancementType extends DefaultedRegistryValue<AdvancementType> {
 
     /**
      * Gets the {@link TextColor} of the advancement type.
diff --git a/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Trigger.java b/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Trigger.java
index 10db3ce166f..bcd7a9b15c5 100644
--- a/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Trigger.java
+++ b/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Trigger.java
@@ -53,7 +53,7 @@
  */
 @SuppressWarnings("unchecked")
 @CatalogedBy(Triggers.class)
-public interface Trigger<C extends FilteredTriggerConfiguration> extends DefaultedRegistryValue {
+public interface Trigger<C extends FilteredTriggerConfiguration> extends DefaultedRegistryValue<Trigger<?>> {
 
     /**
      * Creates a new {@link Builder} which can be used to create
diff --git a/src/main/java/org/spongepowered/api/adventure/ChatType.java b/src/main/java/org/spongepowered/api/adventure/ChatType.java
index 3e27f4e239b..614cf92e516 100644
--- a/src/main/java/org/spongepowered/api/adventure/ChatType.java
+++ b/src/main/java/org/spongepowered/api/adventure/ChatType.java
@@ -35,7 +35,7 @@
  * A type of chat
  */
 @CatalogedBy(ChatTypes.class)
-public interface ChatType extends DefaultedRegistryValue, 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}.
diff --git a/src/main/java/org/spongepowered/api/block/BlockType.java b/src/main/java/org/spongepowered/api/block/BlockType.java
index 261cd4229ad..0109500aa80 100644
--- a/src/main/java/org/spongepowered/api/block/BlockType.java
+++ b/src/main/java/org/spongepowered/api/block/BlockType.java
@@ -44,7 +44,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 DefaultedRegistryValue<BlockType>, ComponentLike, StateContainer<BlockState>, DataHolder.Immutable<BlockType>, Taggable<BlockType> {
 
     /**
      * Return the {@link ItemType} that represents this block.
diff --git a/src/main/java/org/spongepowered/api/block/entity/BlockEntityType.java b/src/main/java/org/spongepowered/api/block/entity/BlockEntityType.java
index 52558596808..8c139afc594 100644
--- a/src/main/java/org/spongepowered/api/block/entity/BlockEntityType.java
+++ b/src/main/java/org/spongepowered/api/block/entity/BlockEntityType.java
@@ -32,7 +32,7 @@
  * Describes a type of block entity.
  */
 @CatalogedBy(BlockEntityTypes.class)
-public interface BlockEntityType extends DefaultedRegistryValue {
+public interface BlockEntityType extends DefaultedRegistryValue<BlockEntityType> {
 
     /**
      * Determines if the provided block is considered valid by the {@link BlockEntity}.
diff --git a/src/main/java/org/spongepowered/api/block/transaction/Operation.java b/src/main/java/org/spongepowered/api/block/transaction/Operation.java
index eb091fe949f..0fc8fe18a42 100644
--- a/src/main/java/org/spongepowered/api/block/transaction/Operation.java
+++ b/src/main/java/org/spongepowered/api/block/transaction/Operation.java
@@ -34,5 +34,5 @@
  * but holds no bearing on the order of a transaction taking place.
  */
 @CatalogedBy(Operations.class)
-public interface Operation extends DefaultedRegistryValue {
+public interface Operation extends DefaultedRegistryValue<Operation> {
 }
diff --git a/src/main/java/org/spongepowered/api/command/parameter/managed/ValueParameter.java b/src/main/java/org/spongepowered/api/command/parameter/managed/ValueParameter.java
index 0fac93eb53e..2ccb3c8c149 100644
--- a/src/main/java/org/spongepowered/api/command/parameter/managed/ValueParameter.java
+++ b/src/main/java/org/spongepowered/api/command/parameter/managed/ValueParameter.java
@@ -48,7 +48,7 @@
  * @see org.spongepowered.api.command.parameter.managed.ValueParser
  * @see org.spongepowered.api.command.parameter.managed.ValueUsage
  */
-public interface ValueParameter<T> extends DefaultedRegistryValue, ValueCompleter, ValueParser<T>, ValueUsage {
+public interface ValueParameter<T> extends DefaultedRegistryValue<ValueParameter<?>>, ValueCompleter, ValueParser<T>, ValueUsage {
 
     @Override
     default String usage(@NonNull final String key) {
diff --git a/src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionType.java b/src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionType.java
index fc088fbf823..816e048b98a 100644
--- a/src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionType.java
+++ b/src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionType.java
@@ -37,5 +37,5 @@
  * types</p>
  */
 @CatalogedBy(ClientCompletionTypes.class)
-public interface ClientCompletionType extends DefaultedRegistryValue {
+public interface ClientCompletionType extends DefaultedRegistryValue<ClientCompletionType> {
 }
diff --git a/src/main/java/org/spongepowered/api/command/registrar/CommandRegistrarType.java b/src/main/java/org/spongepowered/api/command/registrar/CommandRegistrarType.java
index 3ce3443865b..b57f5974aed 100644
--- a/src/main/java/org/spongepowered/api/command/registrar/CommandRegistrarType.java
+++ b/src/main/java/org/spongepowered/api/command/registrar/CommandRegistrarType.java
@@ -37,7 +37,7 @@
  *
  * @param <T> the handled command type
  */
-public interface CommandRegistrarType<T> extends DefaultedRegistryValue {
+public interface CommandRegistrarType<T> extends DefaultedRegistryValue<CommandRegistrarType<?>> {
 
     /**
      * Gets the type of command that this registrar handles.
diff --git a/src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeNodeType.java b/src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeNodeType.java
index 56903fc2222..b8ec861745d 100644
--- a/src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeNodeType.java
+++ b/src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeNodeType.java
@@ -55,7 +55,7 @@
  * displaying and completing command strings.</p>
  */
 @CatalogedBy(CommandTreeNodeTypes.class)
-public interface CommandTreeNodeType<T extends CommandTreeNode<T>> extends DefaultedRegistryValue, ResourceKeyed {
+public interface CommandTreeNodeType<T extends CommandTreeNode<T>> extends DefaultedRegistryValue<CommandTreeNodeType<?>>, ResourceKeyed {
 
     /**
      * Creates a {@link CommandTreeNode} that represents this
diff --git a/src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithm.java b/src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithm.java
index f0b5530fbd6..ad4aa651e81 100644
--- a/src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithm.java
+++ b/src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithm.java
@@ -32,6 +32,6 @@
  * will have a significant effect when limits are imposed on the selector.
  */
 @CatalogedBy(SelectorSortAlgorithms.class)
-public interface SelectorSortAlgorithm extends DefaultedRegistryValue {
+public interface SelectorSortAlgorithm extends DefaultedRegistryValue<SelectorSortAlgorithm> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/command/selector/SelectorType.java b/src/main/java/org/spongepowered/api/command/selector/SelectorType.java
index a086ea58121..238799b19fc 100644
--- a/src/main/java/org/spongepowered/api/command/selector/SelectorType.java
+++ b/src/main/java/org/spongepowered/api/command/selector/SelectorType.java
@@ -31,7 +31,7 @@
  * Represents a type of selector that Minecraft supplies.
  */
 @CatalogedBy(SelectorTypes.class)
-public interface SelectorType extends DefaultedRegistryValue {
+public interface SelectorType extends DefaultedRegistryValue<SelectorType> {
 
     /**
      * Gets the token that represents this selector type when used in commands.
diff --git a/src/main/java/org/spongepowered/api/data/persistence/DataFormat.java b/src/main/java/org/spongepowered/api/data/persistence/DataFormat.java
index 702a6eb1c1a..81301e96f25 100644
--- a/src/main/java/org/spongepowered/api/data/persistence/DataFormat.java
+++ b/src/main/java/org/spongepowered/api/data/persistence/DataFormat.java
@@ -36,7 +36,7 @@
  * a DataContainer to/from a stream of the specific format.
  */
 @CatalogedBy(DataFormats.class)
-public interface DataFormat extends DefaultedRegistryValue {
+public interface DataFormat extends DefaultedRegistryValue<DataFormat> {
 
     /**
      * Creates a new {@link DataContainer} from the contents of the given
diff --git a/src/main/java/org/spongepowered/api/data/type/ArmorMaterial.java b/src/main/java/org/spongepowered/api/data/type/ArmorMaterial.java
index c59de8bfcc7..e42833fc8dc 100644
--- a/src/main/java/org/spongepowered/api/data/type/ArmorMaterial.java
+++ b/src/main/java/org/spongepowered/api/data/type/ArmorMaterial.java
@@ -37,7 +37,7 @@
  * {@link ItemTypes#DIAMOND_CHESTPLATE}.
  */
 @CatalogedBy(ArmorMaterials.class)
-public interface ArmorMaterial extends DefaultedRegistryValue {
+public interface ArmorMaterial extends DefaultedRegistryValue<ArmorMaterial> {
 
     /**
      * Gets the {@link ItemType} that can be used to "repair" the armor type.
diff --git a/src/main/java/org/spongepowered/api/data/type/ArtType.java b/src/main/java/org/spongepowered/api/data/type/ArtType.java
index 81f6722c7d3..6ec04c3e36f 100644
--- a/src/main/java/org/spongepowered/api/data/type/ArtType.java
+++ b/src/main/java/org/spongepowered/api/data/type/ArtType.java
@@ -37,7 +37,7 @@
  * 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 DefaultedRegistryValue<ArtType>, DataPackSerializable {
 
     static Builder builder() {
         return Sponge.game().builderProvider().provide(Builder.class);
diff --git a/src/main/java/org/spongepowered/api/data/type/AttachmentSurface.java b/src/main/java/org/spongepowered/api/data/type/AttachmentSurface.java
index 6c40aadf68c..10f7632cacf 100644
--- a/src/main/java/org/spongepowered/api/data/type/AttachmentSurface.java
+++ b/src/main/java/org/spongepowered/api/data/type/AttachmentSurface.java
@@ -31,6 +31,6 @@
  * Represents a block surface.
  */
 @CatalogedBy(AttachmentSurfaces.class)
-public interface AttachmentSurface extends DefaultedRegistryValue, Comparable<AttachmentSurface>, StringRepresentable {
+public interface AttachmentSurface extends DefaultedRegistryValue<AttachmentSurface>, Comparable<AttachmentSurface>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/AxolotlVariant.java b/src/main/java/org/spongepowered/api/data/type/AxolotlVariant.java
index f9a837c8475..9312db093a1 100644
--- a/src/main/java/org/spongepowered/api/data/type/AxolotlVariant.java
+++ b/src/main/java/org/spongepowered/api/data/type/AxolotlVariant.java
@@ -28,5 +28,5 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(AxolotlVariants.class)
-public interface AxolotlVariant extends DefaultedRegistryValue, StringRepresentable {
+public interface AxolotlVariant extends DefaultedRegistryValue<AxolotlVariant>, StringRepresentable {
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/BambooLeavesType.java b/src/main/java/org/spongepowered/api/data/type/BambooLeavesType.java
index f94c386171c..94c9df2f54b 100644
--- a/src/main/java/org/spongepowered/api/data/type/BambooLeavesType.java
+++ b/src/main/java/org/spongepowered/api/data/type/BambooLeavesType.java
@@ -32,6 +32,6 @@
  * Represents the type of leaves of a {@link BlockTypes#BAMBOO} block.
  */
 @CatalogedBy(BambooLeavesTypes.class)
-public interface BambooLeavesType extends DefaultedRegistryValue, Comparable<BambooLeavesType>, StringRepresentable {
+public interface BambooLeavesType extends DefaultedRegistryValue<BambooLeavesType>, Comparable<BambooLeavesType>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/BannerPatternShape.java b/src/main/java/org/spongepowered/api/data/type/BannerPatternShape.java
index dc0ceddfecb..0df50225f1e 100644
--- a/src/main/java/org/spongepowered/api/data/type/BannerPatternShape.java
+++ b/src/main/java/org/spongepowered/api/data/type/BannerPatternShape.java
@@ -31,6 +31,6 @@
  * A pattern shape which may be applied to a banner.
  */
 @CatalogedBy(BannerPatternShapes.class)
-public interface BannerPatternShape extends DefaultedRegistryValue {
+public interface BannerPatternShape extends DefaultedRegistryValue<BannerPatternShape> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/BellAttachmentType.java b/src/main/java/org/spongepowered/api/data/type/BellAttachmentType.java
index 106643793b5..403de266552 100644
--- a/src/main/java/org/spongepowered/api/data/type/BellAttachmentType.java
+++ b/src/main/java/org/spongepowered/api/data/type/BellAttachmentType.java
@@ -32,6 +32,6 @@
  * Represents the attachment-type of a {@link BlockTypes#BELL} block.
  */
 @CatalogedBy(BellAttachmentTypes.class)
-public interface BellAttachmentType extends DefaultedRegistryValue, Comparable<BellAttachmentType>, StringRepresentable {
+public interface BellAttachmentType extends DefaultedRegistryValue<BellAttachmentType>, Comparable<BellAttachmentType>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/BoatType.java b/src/main/java/org/spongepowered/api/data/type/BoatType.java
index 4ad6140ffa1..caa1b340ad2 100644
--- a/src/main/java/org/spongepowered/api/data/type/BoatType.java
+++ b/src/main/java/org/spongepowered/api/data/type/BoatType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(BoatTypes.class)
-public interface BoatType extends DefaultedRegistryValue {
+public interface BoatType extends DefaultedRegistryValue<BoatType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/BodyPart.java b/src/main/java/org/spongepowered/api/data/type/BodyPart.java
index cca394819f8..d197f42a2ff 100644
--- a/src/main/java/org/spongepowered/api/data/type/BodyPart.java
+++ b/src/main/java/org/spongepowered/api/data/type/BodyPart.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(BodyParts.class)
-public interface BodyPart extends DefaultedRegistryValue {
+public interface BodyPart extends DefaultedRegistryValue<BodyPart> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/CatType.java b/src/main/java/org/spongepowered/api/data/type/CatType.java
index e45c2cc7ab8..7a5462320db 100644
--- a/src/main/java/org/spongepowered/api/data/type/CatType.java
+++ b/src/main/java/org/spongepowered/api/data/type/CatType.java
@@ -31,6 +31,6 @@
  * Represents the type of cat a cat is.
  */
 @CatalogedBy(CatTypes.class)
-public interface CatType extends DefaultedRegistryValue {
+public interface CatType extends DefaultedRegistryValue<CatType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/ChestAttachmentType.java b/src/main/java/org/spongepowered/api/data/type/ChestAttachmentType.java
index d533040edab..8ee2c98af0a 100644
--- a/src/main/java/org/spongepowered/api/data/type/ChestAttachmentType.java
+++ b/src/main/java/org/spongepowered/api/data/type/ChestAttachmentType.java
@@ -34,6 +34,6 @@
  * chests into a double chests.
  */
 @CatalogedBy(ChestAttachmentTypes.class)
-public interface ChestAttachmentType extends DefaultedRegistryValue, Comparable<ChestAttachmentType>, StringRepresentable {
+public interface ChestAttachmentType extends DefaultedRegistryValue<ChestAttachmentType>, Comparable<ChestAttachmentType>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/ComparatorMode.java b/src/main/java/org/spongepowered/api/data/type/ComparatorMode.java
index 02a2ab223d3..60ca167f640 100644
--- a/src/main/java/org/spongepowered/api/data/type/ComparatorMode.java
+++ b/src/main/java/org/spongepowered/api/data/type/ComparatorMode.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(ComparatorModes.class)
-public interface ComparatorMode extends DefaultedRegistryValue, Comparable<ComparatorMode>, StringRepresentable {
+public interface ComparatorMode extends DefaultedRegistryValue<ComparatorMode>, Comparable<ComparatorMode>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/DoorHinge.java b/src/main/java/org/spongepowered/api/data/type/DoorHinge.java
index e24042f9870..c1df5c6d0e1 100644
--- a/src/main/java/org/spongepowered/api/data/type/DoorHinge.java
+++ b/src/main/java/org/spongepowered/api/data/type/DoorHinge.java
@@ -32,6 +32,6 @@
  * Represents a side of a hinge.
  */
 @CatalogedBy(DoorHinges.class)
-public interface DoorHinge extends DefaultedRegistryValue, Cycleable<DoorHinge>, Comparable<DoorHinge>, StringRepresentable {
+public interface DoorHinge extends DefaultedRegistryValue<DoorHinge>, Cycleable<DoorHinge>, Comparable<DoorHinge>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/DripstoneSegment.java b/src/main/java/org/spongepowered/api/data/type/DripstoneSegment.java
index 156051a015a..d00f003624d 100644
--- a/src/main/java/org/spongepowered/api/data/type/DripstoneSegment.java
+++ b/src/main/java/org/spongepowered/api/data/type/DripstoneSegment.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(DripstoneSegments.class)
-public interface DripstoneSegment extends DefaultedRegistryValue, Comparable<DripstoneSegment>, StringRepresentable {
+public interface DripstoneSegment extends DefaultedRegistryValue<DripstoneSegment>, Comparable<DripstoneSegment>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/DyeColor.java b/src/main/java/org/spongepowered/api/data/type/DyeColor.java
index 627b7dc2bd1..d10d861cbb9 100644
--- a/src/main/java/org/spongepowered/api/data/type/DyeColor.java
+++ b/src/main/java/org/spongepowered/api/data/type/DyeColor.java
@@ -32,7 +32,7 @@
  * Represents a color of dye that can be used by various items and blocks.
  */
 @CatalogedBy(DyeColors.class)
-public interface DyeColor extends DefaultedRegistryValue {
+public interface DyeColor extends DefaultedRegistryValue<DyeColor> {
 
     /**
      * Gets this dye color as a {@link Color} for easy translation.
diff --git a/src/main/java/org/spongepowered/api/data/type/FoxType.java b/src/main/java/org/spongepowered/api/data/type/FoxType.java
index 0cfc3d8877d..4596edcce66 100644
--- a/src/main/java/org/spongepowered/api/data/type/FoxType.java
+++ b/src/main/java/org/spongepowered/api/data/type/FoxType.java
@@ -31,6 +31,6 @@
  * Represents a type of fox a fox is.
  */
 @CatalogedBy(FoxTypes.class)
-public interface FoxType extends DefaultedRegistryValue {
+public interface FoxType extends DefaultedRegistryValue<FoxType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/HandPreference.java b/src/main/java/org/spongepowered/api/data/type/HandPreference.java
index 41e77f7ac50..d98d1ec6f1f 100644
--- a/src/main/java/org/spongepowered/api/data/type/HandPreference.java
+++ b/src/main/java/org/spongepowered/api/data/type/HandPreference.java
@@ -36,6 +36,6 @@
  * <p>For players, this is controlled by the left hand/right hand setting</p>
  */
 @CatalogedBy(HandPreferences.class)
-public interface HandPreference extends DefaultedRegistryValue, ComponentLike, StringRepresentable {
+public interface HandPreference extends DefaultedRegistryValue<HandPreference>, ComponentLike, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/HandType.java b/src/main/java/org/spongepowered/api/data/type/HandType.java
index 3d28c5610d8..3bbee5a626e 100644
--- a/src/main/java/org/spongepowered/api/data/type/HandType.java
+++ b/src/main/java/org/spongepowered/api/data/type/HandType.java
@@ -35,6 +35,6 @@
  * preference.
  */
 @CatalogedBy(HandTypes.class)
-public interface HandType extends DefaultedRegistryValue {
+public interface HandType extends DefaultedRegistryValue<HandType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/HorseColor.java b/src/main/java/org/spongepowered/api/data/type/HorseColor.java
index 54a2da61c6f..6f4e65e52a2 100644
--- a/src/main/java/org/spongepowered/api/data/type/HorseColor.java
+++ b/src/main/java/org/spongepowered/api/data/type/HorseColor.java
@@ -33,6 +33,6 @@
  * <p>The color of a horse is a genetic trait that can be inherited to a new born horse.</p>
  */
 @CatalogedBy(HorseColors.class)
-public interface HorseColor extends DefaultedRegistryValue {
+public interface HorseColor extends DefaultedRegistryValue<HorseColor> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/HorseStyle.java b/src/main/java/org/spongepowered/api/data/type/HorseStyle.java
index a884fff1d01..07a328d5f1d 100644
--- a/src/main/java/org/spongepowered/api/data/type/HorseStyle.java
+++ b/src/main/java/org/spongepowered/api/data/type/HorseStyle.java
@@ -34,6 +34,6 @@
  * horse. The style can be inherited to new born child horses.</p>
  */
 @CatalogedBy(HorseStyles.class)
-public interface HorseStyle extends DefaultedRegistryValue {
+public interface HorseStyle extends DefaultedRegistryValue<HorseStyle> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/InstrumentType.java b/src/main/java/org/spongepowered/api/data/type/InstrumentType.java
index 9d3d1649c12..192348c1f48 100644
--- a/src/main/java/org/spongepowered/api/data/type/InstrumentType.java
+++ b/src/main/java/org/spongepowered/api/data/type/InstrumentType.java
@@ -32,7 +32,7 @@
  * Represents a type of instrument.
  */
 @CatalogedBy(InstrumentTypes.class)
-public interface InstrumentType extends DefaultedRegistryValue, Comparable<InstrumentType>, StringRepresentable {
+public interface InstrumentType extends DefaultedRegistryValue<InstrumentType>, Comparable<InstrumentType>, StringRepresentable {
 
     /**
      * Gets the {@link SoundType} that is used by
diff --git a/src/main/java/org/spongepowered/api/data/type/ItemTier.java b/src/main/java/org/spongepowered/api/data/type/ItemTier.java
index ccc82dd75b7..ca4893872e2 100644
--- a/src/main/java/org/spongepowered/api/data/type/ItemTier.java
+++ b/src/main/java/org/spongepowered/api/data/type/ItemTier.java
@@ -29,7 +29,7 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(ItemTiers.class)
-public interface ItemTier extends DefaultedRegistryValue {
+public interface ItemTier extends DefaultedRegistryValue<ItemTier> {
 
     /**
      * Gets the {@link Ingredient} needed to repair this tool.
diff --git a/src/main/java/org/spongepowered/api/data/type/JigsawBlockOrientation.java b/src/main/java/org/spongepowered/api/data/type/JigsawBlockOrientation.java
index 84cabb9c2c1..4d417502e5c 100644
--- a/src/main/java/org/spongepowered/api/data/type/JigsawBlockOrientation.java
+++ b/src/main/java/org/spongepowered/api/data/type/JigsawBlockOrientation.java
@@ -33,7 +33,7 @@
  * Represents the front and top orientation of {@link BlockTypes#JIGSAW} blocks.
  */
 @CatalogedBy(JigsawBlockOrientations.class)
-public interface JigsawBlockOrientation extends DefaultedRegistryValue, Comparable<JigsawBlockOrientation>, StringRepresentable {
+public interface JigsawBlockOrientation extends DefaultedRegistryValue<JigsawBlockOrientation>, Comparable<JigsawBlockOrientation>, StringRepresentable {
 
     /**
      * The front facing direction of a jigsaw block.
diff --git a/src/main/java/org/spongepowered/api/data/type/LlamaType.java b/src/main/java/org/spongepowered/api/data/type/LlamaType.java
index 648b74cd434..3c5e2e40021 100644
--- a/src/main/java/org/spongepowered/api/data/type/LlamaType.java
+++ b/src/main/java/org/spongepowered/api/data/type/LlamaType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(LlamaTypes.class)
-public interface LlamaType extends DefaultedRegistryValue {
+public interface LlamaType extends DefaultedRegistryValue<LlamaType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/MatterType.java b/src/main/java/org/spongepowered/api/data/type/MatterType.java
index 3e704778c07..e8fbe54048b 100644
--- a/src/main/java/org/spongepowered/api/data/type/MatterType.java
+++ b/src/main/java/org/spongepowered/api/data/type/MatterType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(MatterTypes.class)
-public interface MatterType extends DefaultedRegistryValue {
+public interface MatterType extends DefaultedRegistryValue<MatterType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/MooshroomType.java b/src/main/java/org/spongepowered/api/data/type/MooshroomType.java
index f4798b42dc7..5d00ed2ec5c 100644
--- a/src/main/java/org/spongepowered/api/data/type/MooshroomType.java
+++ b/src/main/java/org/spongepowered/api/data/type/MooshroomType.java
@@ -31,6 +31,6 @@
  * Represents a type of mooshroom a mooshroom is.
  */
 @CatalogedBy(MooshroomTypes.class)
-public interface MooshroomType extends DefaultedRegistryValue {
+public interface MooshroomType extends DefaultedRegistryValue<MooshroomType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/NotePitch.java b/src/main/java/org/spongepowered/api/data/type/NotePitch.java
index 40af670682b..ae3c974ff06 100644
--- a/src/main/java/org/spongepowered/api/data/type/NotePitch.java
+++ b/src/main/java/org/spongepowered/api/data/type/NotePitch.java
@@ -33,6 +33,6 @@
  * Represents a NotePitch which may be played by a {@link BlockTypes#NOTE_BLOCK}.
  */
 @CatalogedBy(NotePitches.class)
-public interface NotePitch extends DefaultedRegistryValue, Cycleable<NotePitch> {
+public interface NotePitch extends DefaultedRegistryValue<NotePitch>, Cycleable<NotePitch> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/PandaGene.java b/src/main/java/org/spongepowered/api/data/type/PandaGene.java
index a665c46a49b..1c0bc053749 100644
--- a/src/main/java/org/spongepowered/api/data/type/PandaGene.java
+++ b/src/main/java/org/spongepowered/api/data/type/PandaGene.java
@@ -31,7 +31,7 @@
  * Represents the type of panda a panda is.
  */
 @CatalogedBy(PandaGenes.class)
-public interface PandaGene extends DefaultedRegistryValue {
+public interface PandaGene extends DefaultedRegistryValue<PandaGene> {
 
     boolean isRecessive();
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/ParrotType.java b/src/main/java/org/spongepowered/api/data/type/ParrotType.java
index 83c9593ce0d..7b654e8b52a 100644
--- a/src/main/java/org/spongepowered/api/data/type/ParrotType.java
+++ b/src/main/java/org/spongepowered/api/data/type/ParrotType.java
@@ -32,6 +32,6 @@
  * Represents the type of a {@link Parrot}.
  */
 @CatalogedBy(ParrotTypes.class)
-public interface ParrotType extends DefaultedRegistryValue {
+public interface ParrotType extends DefaultedRegistryValue<ParrotType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/PhantomPhase.java b/src/main/java/org/spongepowered/api/data/type/PhantomPhase.java
index e764f2d3380..f3c664f0dc1 100644
--- a/src/main/java/org/spongepowered/api/data/type/PhantomPhase.java
+++ b/src/main/java/org/spongepowered/api/data/type/PhantomPhase.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(PhantomPhases.class)
-public interface PhantomPhase extends DefaultedRegistryValue {
+public interface PhantomPhase extends DefaultedRegistryValue<PhantomPhase> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/PickupRule.java b/src/main/java/org/spongepowered/api/data/type/PickupRule.java
index c9c78eaddf2..021a6dcd79c 100644
--- a/src/main/java/org/spongepowered/api/data/type/PickupRule.java
+++ b/src/main/java/org/spongepowered/api/data/type/PickupRule.java
@@ -32,6 +32,6 @@
  * Represents a pickup rule used by {@link ArrowLike}s.
  */
 @CatalogedBy(PickupRules.class)
-public interface PickupRule extends DefaultedRegistryValue {
+public interface PickupRule extends DefaultedRegistryValue<PickupRule> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/PistonType.java b/src/main/java/org/spongepowered/api/data/type/PistonType.java
index a52e8c2f201..c1d51f0c7c8 100644
--- a/src/main/java/org/spongepowered/api/data/type/PistonType.java
+++ b/src/main/java/org/spongepowered/api/data/type/PistonType.java
@@ -31,6 +31,6 @@
  * Represents a "type" of piston.
  */
 @CatalogedBy(PistonTypes.class)
-public interface PistonType extends DefaultedRegistryValue, Comparable<PistonType>, StringRepresentable {
+public interface PistonType extends DefaultedRegistryValue<PistonType>, Comparable<PistonType>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/PortionType.java b/src/main/java/org/spongepowered/api/data/type/PortionType.java
index efac7f30217..fc43466f16d 100644
--- a/src/main/java/org/spongepowered/api/data/type/PortionType.java
+++ b/src/main/java/org/spongepowered/api/data/type/PortionType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(PortionTypes.class)
-public interface PortionType extends DefaultedRegistryValue, Comparable<PortionType>, StringRepresentable {
+public interface PortionType extends DefaultedRegistryValue<PortionType>, Comparable<PortionType>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/ProfessionType.java b/src/main/java/org/spongepowered/api/data/type/ProfessionType.java
index 61d3c70b06e..2579b698bc4 100644
--- a/src/main/java/org/spongepowered/api/data/type/ProfessionType.java
+++ b/src/main/java/org/spongepowered/api/data/type/ProfessionType.java
@@ -33,6 +33,6 @@
  * trade offers a trader may offer to a player.
  */
 @CatalogedBy(ProfessionTypes.class)
-public interface ProfessionType extends DefaultedRegistryValue {
+public interface ProfessionType extends DefaultedRegistryValue<ProfessionType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/RabbitType.java b/src/main/java/org/spongepowered/api/data/type/RabbitType.java
index b7809653488..24f273e83b6 100644
--- a/src/main/java/org/spongepowered/api/data/type/RabbitType.java
+++ b/src/main/java/org/spongepowered/api/data/type/RabbitType.java
@@ -32,6 +32,6 @@
  * Represents a type of {@link Rabbit}.
  */
 @CatalogedBy(RabbitTypes.class)
-public interface RabbitType extends DefaultedRegistryValue {
+public interface RabbitType extends DefaultedRegistryValue<RabbitType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/RaidStatus.java b/src/main/java/org/spongepowered/api/data/type/RaidStatus.java
index cd4ddfacfa3..0564237edc8 100644
--- a/src/main/java/org/spongepowered/api/data/type/RaidStatus.java
+++ b/src/main/java/org/spongepowered/api/data/type/RaidStatus.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(RaidStatuses.class)
-public interface RaidStatus extends DefaultedRegistryValue {
+public interface RaidStatus extends DefaultedRegistryValue<RaidStatus> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/RailDirection.java b/src/main/java/org/spongepowered/api/data/type/RailDirection.java
index 4d21ad9d24a..9f681737a9e 100644
--- a/src/main/java/org/spongepowered/api/data/type/RailDirection.java
+++ b/src/main/java/org/spongepowered/api/data/type/RailDirection.java
@@ -29,6 +29,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(RailDirections.class)
-public interface RailDirection extends DefaultedRegistryValue, Cycleable<RailDirection>, Comparable<RailDirection>, StringRepresentable {
+public interface RailDirection extends DefaultedRegistryValue<RailDirection>, Cycleable<RailDirection>, Comparable<RailDirection>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/SalmonSize.java b/src/main/java/org/spongepowered/api/data/type/SalmonSize.java
index a4ee650de05..d20284e52ad 100644
--- a/src/main/java/org/spongepowered/api/data/type/SalmonSize.java
+++ b/src/main/java/org/spongepowered/api/data/type/SalmonSize.java
@@ -28,5 +28,5 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(SalmonSizes.class)
-public interface SalmonSize extends DefaultedRegistryValue, StringRepresentable {
+public interface SalmonSize extends DefaultedRegistryValue<SalmonSize>, StringRepresentable {
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/SculkSensorState.java b/src/main/java/org/spongepowered/api/data/type/SculkSensorState.java
index 2870604f94f..02972f16353 100644
--- a/src/main/java/org/spongepowered/api/data/type/SculkSensorState.java
+++ b/src/main/java/org/spongepowered/api/data/type/SculkSensorState.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(SculkSensorStates.class)
-public interface SculkSensorState extends DefaultedRegistryValue, Comparable<SculkSensorState>, StringRepresentable {
+public interface SculkSensorState extends DefaultedRegistryValue<SculkSensorState>, Comparable<SculkSensorState>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/SkinPart.java b/src/main/java/org/spongepowered/api/data/type/SkinPart.java
index 79887f44080..0441696319a 100644
--- a/src/main/java/org/spongepowered/api/data/type/SkinPart.java
+++ b/src/main/java/org/spongepowered/api/data/type/SkinPart.java
@@ -32,6 +32,6 @@
  * Represents a part of a player's skin.
  */
 @CatalogedBy(SkinParts.class)
-public interface SkinPart extends DefaultedRegistryValue, ComponentLike {
+public interface SkinPart extends DefaultedRegistryValue<SkinPart>, ComponentLike {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/SlabPortion.java b/src/main/java/org/spongepowered/api/data/type/SlabPortion.java
index af3853a2be8..213caa72e32 100644
--- a/src/main/java/org/spongepowered/api/data/type/SlabPortion.java
+++ b/src/main/java/org/spongepowered/api/data/type/SlabPortion.java
@@ -33,6 +33,6 @@
  * example {@link BlockTypes#STONE_SLAB}.
  */
 @CatalogedBy(SlabPortions.class)
-public interface SlabPortion extends DefaultedRegistryValue, Comparable<SlabPortion>, StringRepresentable {
+public interface SlabPortion extends DefaultedRegistryValue<SlabPortion>, Comparable<SlabPortion>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/SpellType.java b/src/main/java/org/spongepowered/api/data/type/SpellType.java
index 9fd3f79b3cc..1b820904bdf 100644
--- a/src/main/java/org/spongepowered/api/data/type/SpellType.java
+++ b/src/main/java/org/spongepowered/api/data/type/SpellType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(SpellTypes.class)
-public interface SpellType extends DefaultedRegistryValue {
+public interface SpellType extends DefaultedRegistryValue<SpellType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/StairShape.java b/src/main/java/org/spongepowered/api/data/type/StairShape.java
index a445a429130..eab57dae00d 100644
--- a/src/main/java/org/spongepowered/api/data/type/StairShape.java
+++ b/src/main/java/org/spongepowered/api/data/type/StairShape.java
@@ -31,6 +31,6 @@
  * Represents a stair shape.
  */
 @CatalogedBy(StairShapes.class)
-public interface StairShape extends DefaultedRegistryValue, Comparable<StairShape>, StringRepresentable {
+public interface StairShape extends DefaultedRegistryValue<StairShape>, Comparable<StairShape>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/StructureMode.java b/src/main/java/org/spongepowered/api/data/type/StructureMode.java
index 7562aa8d9f2..9da96db59dc 100644
--- a/src/main/java/org/spongepowered/api/data/type/StructureMode.java
+++ b/src/main/java/org/spongepowered/api/data/type/StructureMode.java
@@ -32,6 +32,6 @@
  * Represents a mode that a {@link StructureBlock} may be in.
  */
 @CatalogedBy(StructureModes.class)
-public interface StructureMode extends DefaultedRegistryValue, Comparable<StructureMode>, StringRepresentable {
+public interface StructureMode extends DefaultedRegistryValue<StructureMode>, Comparable<StructureMode>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/Tilt.java b/src/main/java/org/spongepowered/api/data/type/Tilt.java
index eeca1951d71..ddb3614aac5 100644
--- a/src/main/java/org/spongepowered/api/data/type/Tilt.java
+++ b/src/main/java/org/spongepowered/api/data/type/Tilt.java
@@ -28,7 +28,7 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(Tilts.class)
-public interface Tilt extends DefaultedRegistryValue, Comparable<Tilt>, StringRepresentable {
+public interface Tilt extends DefaultedRegistryValue<Tilt>, Comparable<Tilt>, StringRepresentable {
 
     /**
      * {@return Whether a block entering this tilt state will trigger any
diff --git a/src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java b/src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java
index 010860e2aa9..13de3bf4425 100644
--- a/src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java
+++ b/src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java
@@ -34,7 +34,7 @@
  * <p>A TropicalFishShape represents both a fish's appearance and size.</p>
  */
 @CatalogedBy(TropicalFishShapes.class)
-public interface TropicalFishShape extends DefaultedRegistryValue {
+public interface TropicalFishShape extends DefaultedRegistryValue<TropicalFishShape> {
 
     /**
      * Whether this shape represents a large {@link TropicalFish}.
diff --git a/src/main/java/org/spongepowered/api/data/type/VillagerType.java b/src/main/java/org/spongepowered/api/data/type/VillagerType.java
index 4ca7f988a88..f85eddcf6d6 100644
--- a/src/main/java/org/spongepowered/api/data/type/VillagerType.java
+++ b/src/main/java/org/spongepowered/api/data/type/VillagerType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(VillagerTypes.class)
-public interface VillagerType extends DefaultedRegistryValue {
+public interface VillagerType extends DefaultedRegistryValue<VillagerType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/WallConnectionState.java b/src/main/java/org/spongepowered/api/data/type/WallConnectionState.java
index 2ea5feec8e5..908150c356a 100644
--- a/src/main/java/org/spongepowered/api/data/type/WallConnectionState.java
+++ b/src/main/java/org/spongepowered/api/data/type/WallConnectionState.java
@@ -31,6 +31,6 @@
  * Represents the type of wall BlockStates
  */
 @CatalogedBy(WallConnectionStates.class)
-public interface WallConnectionState extends DefaultedRegistryValue, Comparable<WallConnectionState>, StringRepresentable {
+public interface WallConnectionState extends DefaultedRegistryValue<WallConnectionState>, Comparable<WallConnectionState>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/WireAttachmentType.java b/src/main/java/org/spongepowered/api/data/type/WireAttachmentType.java
index dc35ec8fb77..a418ed6e2d4 100644
--- a/src/main/java/org/spongepowered/api/data/type/WireAttachmentType.java
+++ b/src/main/java/org/spongepowered/api/data/type/WireAttachmentType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(WireAttachmentTypes.class)
-public interface WireAttachmentType extends DefaultedRegistryValue, Comparable<WireAttachmentType>, StringRepresentable {
+public interface WireAttachmentType extends DefaultedRegistryValue<WireAttachmentType>, Comparable<WireAttachmentType>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/WolfVariant.java b/src/main/java/org/spongepowered/api/data/type/WolfVariant.java
index 50f041bfaf1..f8209ff2985 100644
--- a/src/main/java/org/spongepowered/api/data/type/WolfVariant.java
+++ b/src/main/java/org/spongepowered/api/data/type/WolfVariant.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(WolfVariants.class)
-public interface WolfVariant extends DefaultedRegistryValue {
+public interface WolfVariant extends DefaultedRegistryValue<WolfVariant> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/effect/particle/ParticleOption.java b/src/main/java/org/spongepowered/api/effect/particle/ParticleOption.java
index 91cc1172c26..fb199688fb1 100644
--- a/src/main/java/org/spongepowered/api/effect/particle/ParticleOption.java
+++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleOption.java
@@ -34,7 +34,7 @@
  * @param <V> The type of the option value
  */
 @CatalogedBy(ParticleOptions.class)
-public interface ParticleOption<V> extends DefaultedRegistryValue {
+public interface ParticleOption<V> extends DefaultedRegistryValue<ParticleOption<?>> {
 
     /**
      * Gets the type of the value.
diff --git a/src/main/java/org/spongepowered/api/effect/particle/ParticleType.java b/src/main/java/org/spongepowered/api/effect/particle/ParticleType.java
index bf12edbcfe6..1fab60ace4a 100644
--- a/src/main/java/org/spongepowered/api/effect/particle/ParticleType.java
+++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleType.java
@@ -35,7 +35,7 @@
  * Represents a particle that can be sent on a Minecraft client.
  */
 @CatalogedBy(ParticleTypes.class)
-public interface ParticleType extends DefaultedRegistryValue {
+public interface ParticleType extends DefaultedRegistryValue<ParticleType> {
 
     /**
      * Gets the default value for the specified {@link ParticleOption}, it may
diff --git a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectType.java b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectType.java
index 7179f435d2a..1641f495db0 100644
--- a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectType.java
+++ b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectType.java
@@ -32,7 +32,7 @@
  * Represents a possible type of {@link PotionEffect}.
  */
 @CatalogedBy(PotionEffectTypes.class)
-public interface PotionEffectType extends DefaultedRegistryValue, ComponentLike {
+public interface PotionEffectType extends DefaultedRegistryValue<PotionEffectType>, ComponentLike {
 
     /**
      * Gets whether this potion effect is applied instantly or over time.
diff --git a/src/main/java/org/spongepowered/api/effect/sound/music/MusicDisc.java b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDisc.java
index d5b01818f9b..6a5de30e4f4 100644
--- a/src/main/java/org/spongepowered/api/effect/sound/music/MusicDisc.java
+++ b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDisc.java
@@ -34,7 +34,7 @@
  * played by a {@link Jukebox}.
  */
 @CatalogedBy(MusicDiscs.class)
-public interface MusicDisc extends DefaultedRegistryValue {
+public interface MusicDisc extends DefaultedRegistryValue<MusicDisc> {
 
     /**
      * Gets the {@link SoundType} that is used
diff --git a/src/main/java/org/spongepowered/api/entity/EntityCategory.java b/src/main/java/org/spongepowered/api/entity/EntityCategory.java
index a1d41ddb211..5f6179ab06b 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityCategory.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityCategory.java
@@ -38,7 +38,7 @@
  * may include {@link Chicken}.
  */
 @CatalogedBy(EntityCategories.class)
-public interface EntityCategory extends DefaultedRegistryValue {
+public interface EntityCategory extends DefaultedRegistryValue<EntityCategory> {
 
     /**
      * Whether this category of entities is considered "friendly".
diff --git a/src/main/java/org/spongepowered/api/entity/EntityType.java b/src/main/java/org/spongepowered/api/entity/EntityType.java
index abb97ed8259..0e9f2e3d301 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityType.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityType.java
@@ -34,7 +34,7 @@
  * 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 DefaultedRegistryValue<EntityType<? extends Entity>>, ComponentLike, Taggable<EntityType<? extends Entity>> {
 
     /**
      * If true {@link Entity entities} of this type will not be saved to disk.
diff --git a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorType.java b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorType.java
index 9eed90f679f..69302971025 100644
--- a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorType.java
+++ b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorType.java
@@ -28,5 +28,5 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(GoalExecutorTypes.class)
-public interface GoalExecutorType extends DefaultedRegistryValue {
+public interface GoalExecutorType extends DefaultedRegistryValue<GoalExecutorType> {
 }
diff --git a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalType.java b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalType.java
index 530060fc2ac..a115fff1afd 100644
--- a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalType.java
+++ b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalType.java
@@ -28,7 +28,7 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(GoalTypes.class)
-public interface GoalType extends DefaultedRegistryValue {
+public interface GoalType extends DefaultedRegistryValue<GoalType> {
 
     /**
      * Gets the {@link Goal} class that this type represents.
diff --git a/src/main/java/org/spongepowered/api/entity/attribute/AttributeOperation.java b/src/main/java/org/spongepowered/api/entity/attribute/AttributeOperation.java
index 3e59ce8b442..5caf8eead7e 100644
--- a/src/main/java/org/spongepowered/api/entity/attribute/AttributeOperation.java
+++ b/src/main/java/org/spongepowered/api/entity/attribute/AttributeOperation.java
@@ -32,6 +32,6 @@
  * {@link Attribute}.
  */
 @CatalogedBy(AttributeOperations.class)
-public interface AttributeOperation extends DefaultedRegistryValue {
+public interface AttributeOperation extends DefaultedRegistryValue<AttributeOperation> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeType.java b/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeType.java
index 1ce5fbe78d8..23568a640cd 100644
--- a/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeType.java
+++ b/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeType.java
@@ -32,7 +32,7 @@
  * Represents an attribute type that can apply effects or modify traits related to an entity.
  */
 @CatalogedBy(AttributeTypes.class)
-public interface AttributeType extends DefaultedRegistryValue {
+public interface AttributeType extends DefaultedRegistryValue<AttributeType> {
 
     /**
      * Gets the default value of this attribute type before any {@link AttributeModifier}s are applied.
diff --git a/src/main/java/org/spongepowered/api/entity/display/BillboardType.java b/src/main/java/org/spongepowered/api/entity/display/BillboardType.java
index 88b2664d818..7c593c95fce 100644
--- a/src/main/java/org/spongepowered/api/entity/display/BillboardType.java
+++ b/src/main/java/org/spongepowered/api/entity/display/BillboardType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(BillboardTypes.class)
-public interface BillboardType extends DefaultedRegistryValue {
+public interface BillboardType extends DefaultedRegistryValue<BillboardType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/entity/display/ItemDisplayType.java b/src/main/java/org/spongepowered/api/entity/display/ItemDisplayType.java
index 10de94fb1cf..a142a3672fa 100644
--- a/src/main/java/org/spongepowered/api/entity/display/ItemDisplayType.java
+++ b/src/main/java/org/spongepowered/api/entity/display/ItemDisplayType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(ItemDisplayTypes.class)
-public interface ItemDisplayType extends DefaultedRegistryValue {
+public interface ItemDisplayType extends DefaultedRegistryValue<ItemDisplayType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/entity/display/TextAlignment.java b/src/main/java/org/spongepowered/api/entity/display/TextAlignment.java
index 3b9d3f984f8..2d90d14356a 100644
--- a/src/main/java/org/spongepowered/api/entity/display/TextAlignment.java
+++ b/src/main/java/org/spongepowered/api/entity/display/TextAlignment.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(TextAlignments.class)
-public interface TextAlignment extends DefaultedRegistryValue {
+public interface TextAlignment extends DefaultedRegistryValue<TextAlignment> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/phase/DragonPhaseType.java b/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/phase/DragonPhaseType.java
index 31d3e703c2e..d8c6b813653 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/phase/DragonPhaseType.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/phase/DragonPhaseType.java
@@ -31,6 +31,6 @@
  * An {@link DragonPhase} type.
  */
 @CatalogedBy(DragonPhaseTypes.class)
-public interface DragonPhaseType extends DefaultedRegistryValue {
+public interface DragonPhaseType extends DefaultedRegistryValue<DragonPhaseType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/entity/living/player/chat/ChatVisibility.java b/src/main/java/org/spongepowered/api/entity/living/player/chat/ChatVisibility.java
index 9da212b7848..fd185537678 100644
--- a/src/main/java/org/spongepowered/api/entity/living/player/chat/ChatVisibility.java
+++ b/src/main/java/org/spongepowered/api/entity/living/player/chat/ChatVisibility.java
@@ -32,7 +32,7 @@
  * Represents a visibility mode for a client's chat.
  */
 @CatalogedBy(ChatVisibilities.class)
-public interface ChatVisibility extends DefaultedRegistryValue, ComponentLike {
+public interface ChatVisibility extends DefaultedRegistryValue<ChatVisibility>, ComponentLike {
 
     /**
      * Tests whether system messages will be visible with this visibility
diff --git a/src/main/java/org/spongepowered/api/entity/living/player/gamemode/GameMode.java b/src/main/java/org/spongepowered/api/entity/living/player/gamemode/GameMode.java
index a8436fa2856..35001ff0856 100644
--- a/src/main/java/org/spongepowered/api/entity/living/player/gamemode/GameMode.java
+++ b/src/main/java/org/spongepowered/api/entity/living/player/gamemode/GameMode.java
@@ -33,6 +33,6 @@
  * Represents a game mode that a {@link Player} may have.
  */
 @CatalogedBy(GameModes.class)
-public interface GameMode extends DefaultedRegistryValue, ComponentLike {
+public interface GameMode extends DefaultedRegistryValue<GameMode>, ComponentLike {
 
 }
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/DismountType.java b/src/main/java/org/spongepowered/api/event/cause/entity/DismountType.java
index c81867891dd..bb41b2a7a8c 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/DismountType.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/DismountType.java
@@ -31,6 +31,6 @@
  * Used to set the {@link org.spongepowered.api.event.EventContextKeys#DISMOUNT_TYPE} in {@link org.spongepowered.api.event.entity.RideEntityEvent.Dismount dismount events}.
  */
 @CatalogedBy(DismountTypes.class)
-public interface DismountType extends DefaultedRegistryValue {
+public interface DismountType extends DefaultedRegistryValue<DismountType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/MovementType.java b/src/main/java/org/spongepowered/api/event/cause/entity/MovementType.java
index 426777de434..168cef60e9f 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/MovementType.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/MovementType.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(MovementTypes.class)
-public interface MovementType extends DefaultedRegistryValue {
+public interface MovementType extends DefaultedRegistryValue<MovementType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/SpawnType.java b/src/main/java/org/spongepowered/api/event/cause/entity/SpawnType.java
index 8d94d3cdc6b..97c07608858 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/SpawnType.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/SpawnType.java
@@ -32,6 +32,6 @@
  * Represents a type of "spawning" for a {@link SpawnEntityEvent}.
  */
 @CatalogedBy(SpawnTypes.class)
-public interface SpawnType extends DefaultedRegistryValue {
+public interface SpawnType extends DefaultedRegistryValue<SpawnType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffect.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffect.java
index 09b24d48657..5dd3cff9500 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffect.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffect.java
@@ -29,6 +29,6 @@
 
 
 @CatalogedBy(DamageEffects.class)
-public interface DamageEffect extends DefaultedRegistryValue {
+public interface DamageEffect extends DefaultedRegistryValue<DamageEffect> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierType.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierType.java
index e27d91de2bc..83d17982d39 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierType.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierType.java
@@ -36,6 +36,6 @@
  * {@link DamageModifier#cause()}.
  */
 @CatalogedBy(DamageModifierTypes.class)
-public interface DamageModifierType extends DefaultedRegistryValue {
+public interface DamageModifierType extends DefaultedRegistryValue<DamageModifierType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScaling.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScaling.java
index cc22b9a9220..bfabed2fc38 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScaling.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScaling.java
@@ -29,6 +29,6 @@
 
 
 @CatalogedBy(DamageScalings.class)
-public interface DamageScaling extends DefaultedRegistryValue {
+public interface DamageScaling extends DefaultedRegistryValue<DamageScaling> {
 
 }
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
index 09930832c5a..558ffaec333 100644
--- 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
@@ -42,7 +42,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 DefaultedRegistryValue<DamageType>, Nameable, Taggable<DamageType>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link DamageType}.
diff --git a/src/main/java/org/spongepowered/api/fluid/FluidType.java b/src/main/java/org/spongepowered/api/fluid/FluidType.java
index c258fe98bef..5f09ae6c072 100644
--- a/src/main/java/org/spongepowered/api/fluid/FluidType.java
+++ b/src/main/java/org/spongepowered/api/fluid/FluidType.java
@@ -48,6 +48,6 @@
  * 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 DefaultedRegistryValue<FluidType>, StateContainer<FluidState>, DataHolder.Immutable<FluidType>, Taggable<FluidType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/item/FireworkShape.java b/src/main/java/org/spongepowered/api/item/FireworkShape.java
index 0e9d5828c01..050d7f60190 100644
--- a/src/main/java/org/spongepowered/api/item/FireworkShape.java
+++ b/src/main/java/org/spongepowered/api/item/FireworkShape.java
@@ -31,6 +31,6 @@
  * Represents a possible shape for a firework explosion.
  */
 @CatalogedBy(FireworkShapes.class)
-public interface FireworkShape extends DefaultedRegistryValue {
+public interface FireworkShape extends DefaultedRegistryValue<FireworkShape> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/item/ItemType.java b/src/main/java/org/spongepowered/api/item/ItemType.java
index 398dd7b4ff1..6b5cd98eaa0 100644
--- a/src/main/java/org/spongepowered/api/item/ItemType.java
+++ b/src/main/java/org/spongepowered/api/item/ItemType.java
@@ -39,7 +39,7 @@
  * A type of item.
  */
 @CatalogedBy(ItemTypes.class)
-public interface ItemType extends DefaultedRegistryValue, ComponentLike, DataHolder.Immutable<ItemType>, Taggable<ItemType> {
+public interface ItemType extends DefaultedRegistryValue<ItemType>, ComponentLike, DataHolder.Immutable<ItemType>, Taggable<ItemType> {
 
     /**
      * Gets the corresponding {@link BlockType} of this item if one exists.
diff --git a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java
index 804eaa1bc8e..6adaf01f959 100644
--- a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java
+++ b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java
@@ -36,7 +36,7 @@
  * 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 DefaultedRegistryValue<EnchantmentType>, ComponentLike, Taggable<EnchantmentType> {
 
     /**
      * Gets the weight of this enchantment type.
diff --git a/src/main/java/org/spongepowered/api/item/inventory/ContainerType.java b/src/main/java/org/spongepowered/api/item/inventory/ContainerType.java
index 4022689ad5c..86f702f864e 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/ContainerType.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/ContainerType.java
@@ -33,6 +33,6 @@
  * It defines what {@link Container} is displayed on the client side when the inventory is opened.
  */
 @CatalogedBy(ContainerTypes.class)
-public interface ContainerType extends DefaultedRegistryValue {
+public interface ContainerType extends DefaultedRegistryValue<ContainerType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroup.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroup.java
index e036225f15d..7dd88c31abc 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroup.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroup.java
@@ -31,6 +31,6 @@
  * Represents a grouping of {@link EquipmentType equipment}.
  */
 @CatalogedBy(EquipmentGroups.class)
-public interface EquipmentGroup extends DefaultedRegistryValue {
+public interface EquipmentGroup extends DefaultedRegistryValue<EquipmentGroup> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentType.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentType.java
index da2e28ca180..63396b9a83e 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentType.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentType.java
@@ -31,7 +31,7 @@
  * Represents a equipment type.
  */
 @CatalogedBy(EquipmentTypes.class)
-public interface EquipmentType extends DefaultedRegistryValue {
+public interface EquipmentType extends DefaultedRegistryValue<EquipmentType> {
 
     /**
      * Gets the {@link EquipmentGroup group} this equipment falls under.
diff --git a/src/main/java/org/spongepowered/api/item/inventory/menu/ClickType.java b/src/main/java/org/spongepowered/api/item/inventory/menu/ClickType.java
index ef46a8f375a..de0adb7a5b5 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/menu/ClickType.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/menu/ClickType.java
@@ -34,6 +34,6 @@
  * @param <T> The handler for the click type
  */
 @CatalogedBy(ClickTypes.class)
-public interface ClickType<T> extends DefaultedRegistryValue {
+public interface ClickType<T> extends DefaultedRegistryValue<ClickType<?>> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/item/inventory/query/QueryType.java b/src/main/java/org/spongepowered/api/item/inventory/query/QueryType.java
index dd745418fe9..da1fb7e5e8e 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/query/QueryType.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/query/QueryType.java
@@ -32,7 +32,7 @@
  * Represents a possible type of operation for an {@link Inventory#query inventory query}.
  */
 @CatalogedBy(QueryTypes.class)
-public interface QueryType extends DefaultedRegistryValue {
+public interface QueryType extends DefaultedRegistryValue<QueryType> {
 
     /**
      * A type of query that requires no parameters. It can directly be used as a query.
diff --git a/src/main/java/org/spongepowered/api/item/potion/PotionType.java b/src/main/java/org/spongepowered/api/item/potion/PotionType.java
index 842185786c3..b2cf7d5a4f7 100644
--- a/src/main/java/org/spongepowered/api/item/potion/PotionType.java
+++ b/src/main/java/org/spongepowered/api/item/potion/PotionType.java
@@ -34,7 +34,7 @@
  * Represents a type of potion with specific {@link PotionEffect}s.
  */
 @CatalogedBy(PotionTypes.class)
-public interface PotionType extends DefaultedRegistryValue {
+public interface PotionType extends DefaultedRegistryValue<PotionType> {
 
     List<PotionEffect> effects();
 }
diff --git a/src/main/java/org/spongepowered/api/item/recipe/Recipe.java b/src/main/java/org/spongepowered/api/item/recipe/Recipe.java
index c4050c5737c..6ef2f7a04a9 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/Recipe.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/Recipe.java
@@ -58,7 +58,7 @@
  * <p>{@link StoneCutterRecipe} for recipes in a {@link BlockTypes#STONECUTTER} block</p>
  * <p>{@link SmithingRecipe} for recipes in a {@link BlockTypes#SMITHING_TABLE} block</p>
  */
-public interface Recipe<T extends RecipeInput> extends DefaultedRegistryValue, DataPackSerializable {
+public interface Recipe<T extends RecipeInput> extends DefaultedRegistryValue<Recipe<?>>, DataPackSerializable {
 
     /**
      * Checks if the given inventory fits the required constraints to make a valid recipe
diff --git a/src/main/java/org/spongepowered/api/item/recipe/RecipeType.java b/src/main/java/org/spongepowered/api/item/recipe/RecipeType.java
index 11f1b55ac77..5ee0bd09d4f 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/RecipeType.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/RecipeType.java
@@ -29,7 +29,7 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(RecipeTypes.class)
-public interface RecipeType<T extends Recipe<? extends RecipeInput>> extends DefaultedRegistryValue {
+public interface RecipeType<T extends Recipe<? extends RecipeInput>> extends DefaultedRegistryValue<RecipeType<?>> {
 
 
 }
diff --git a/src/main/java/org/spongepowered/api/item/recipe/smithing/TrimMaterial.java b/src/main/java/org/spongepowered/api/item/recipe/smithing/TrimMaterial.java
index 88585747eca..73300783490 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/smithing/TrimMaterial.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/smithing/TrimMaterial.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(TrimMaterials.class)
-public interface TrimMaterial extends DefaultedRegistryValue {
+public interface TrimMaterial extends DefaultedRegistryValue<TrimMaterial> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/item/recipe/smithing/TrimPattern.java b/src/main/java/org/spongepowered/api/item/recipe/smithing/TrimPattern.java
index 5846c44fb96..c0500837174 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/smithing/TrimPattern.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/smithing/TrimPattern.java
@@ -28,5 +28,5 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(TrimPatterns.class)
-public interface TrimPattern extends DefaultedRegistryValue {
+public interface TrimPattern extends DefaultedRegistryValue<TrimPattern> {
 }
diff --git a/src/main/java/org/spongepowered/api/map/color/MapColorType.java b/src/main/java/org/spongepowered/api/map/color/MapColorType.java
index 17e0cdfc02d..bb8531c8b28 100644
--- a/src/main/java/org/spongepowered/api/map/color/MapColorType.java
+++ b/src/main/java/org/spongepowered/api/map/color/MapColorType.java
@@ -33,7 +33,7 @@
  * Represents a color that can be used when drawing on a {@link MapCanvas}.
  */
 @CatalogedBy(MapColorTypes.class)
-public interface MapColorType extends DefaultedRegistryValue {
+public interface MapColorType extends DefaultedRegistryValue<MapColorType> {
 
     /**
      * Gets the {@link Color} that this type represents.
diff --git a/src/main/java/org/spongepowered/api/map/color/MapShade.java b/src/main/java/org/spongepowered/api/map/color/MapShade.java
index a2c3dddf179..2a26974e844 100644
--- a/src/main/java/org/spongepowered/api/map/color/MapShade.java
+++ b/src/main/java/org/spongepowered/api/map/color/MapShade.java
@@ -32,5 +32,5 @@
  * to form a {@link MapColor}
  */
 @CatalogedBy(MapShades.class)
-public interface MapShade extends DefaultedRegistryValue {
+public interface MapShade extends DefaultedRegistryValue<MapShade> {
 }
diff --git a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationType.java b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationType.java
index 72549a60d4c..90b33164e66 100644
--- a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationType.java
+++ b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationType.java
@@ -35,7 +35,7 @@
  * Represents a symbol that may be used on a {@link MapCanvas} as part of a {@link MapDecoration}.
  */
 @CatalogedBy(MapDecorationTypes.class)
-public interface MapDecorationType extends DefaultedRegistryValue {
+public interface MapDecorationType extends DefaultedRegistryValue<MapDecorationType> {
 
     /**
      * Gets the corresponding {@link DyeColor} that this banner decoration type is.
diff --git a/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientation.java b/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientation.java
index 82a7c8e1003..3a70735d3e5 100644
--- a/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientation.java
+++ b/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientation.java
@@ -32,6 +32,6 @@
  * pointing in on a {@link org.spongepowered.api.map.MapInfo}.
  */
 @CatalogedBy(MapDecorationOrientations.class)
-public interface MapDecorationOrientation extends DefaultedRegistryValue {
+public interface MapDecorationOrientation extends DefaultedRegistryValue<MapDecorationOrientation> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/placeholder/PlaceholderParser.java b/src/main/java/org/spongepowered/api/placeholder/PlaceholderParser.java
index ca769b877ff..3046473f6be 100644
--- a/src/main/java/org/spongepowered/api/placeholder/PlaceholderParser.java
+++ b/src/main/java/org/spongepowered/api/placeholder/PlaceholderParser.java
@@ -35,7 +35,7 @@
  * Provides the logic of how to parse a placeholder token.
  */
 @CatalogedBy(PlaceholderParsers.class)
-public interface PlaceholderParser extends DefaultedRegistryValue {
+public interface PlaceholderParser extends DefaultedRegistryValue<PlaceholderParser> {
 
     /**
      * Returns a {@link Builder} that allows for the creation of simple
diff --git a/src/main/java/org/spongepowered/api/scheduler/TaskPriority.java b/src/main/java/org/spongepowered/api/scheduler/TaskPriority.java
index 5fcb72fdbf7..8a1c1f6431c 100644
--- a/src/main/java/org/spongepowered/api/scheduler/TaskPriority.java
+++ b/src/main/java/org/spongepowered/api/scheduler/TaskPriority.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(TaskPriorities.class)
-public interface TaskPriority extends DefaultedRegistryValue {
+public interface TaskPriority extends DefaultedRegistryValue<TaskPriority> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/scoreboard/CollisionRule.java b/src/main/java/org/spongepowered/api/scoreboard/CollisionRule.java
index c61cc55d741..2c156a0e18b 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/CollisionRule.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/CollisionRule.java
@@ -35,6 +35,6 @@
  * a {@link Team} collide with other entities.</p>
  */
 @CatalogedBy(CollisionRules.class)
-public interface CollisionRule extends DefaultedRegistryValue, ComponentLike {
+public interface CollisionRule extends DefaultedRegistryValue<CollisionRule>, ComponentLike {
 
 }
diff --git a/src/main/java/org/spongepowered/api/scoreboard/Visibility.java b/src/main/java/org/spongepowered/api/scoreboard/Visibility.java
index ed27d3eb11e..ff4c952d57e 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/Visibility.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/Visibility.java
@@ -34,6 +34,6 @@
  * <p>Usages include nametags and death messages.</p>
  */
 @CatalogedBy(Visibilities.class)
-public interface Visibility extends DefaultedRegistryValue, ComponentLike {
+public interface Visibility extends DefaultedRegistryValue<Visibility>, ComponentLike {
 
 }
diff --git a/src/main/java/org/spongepowered/api/scoreboard/criteria/Criterion.java b/src/main/java/org/spongepowered/api/scoreboard/criteria/Criterion.java
index 1ddf95c1647..d44a80ac383 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/criteria/Criterion.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/criteria/Criterion.java
@@ -33,7 +33,7 @@
  * automatically updated.
  */
 @CatalogedBy(Criteria.class)
-public interface Criterion extends DefaultedRegistryValue {
+public interface Criterion extends DefaultedRegistryValue<Criterion> {
 
     ObjectiveDisplayMode displayMode();
 }
diff --git a/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlot.java b/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlot.java
index 9ba8b304db7..47159f3d85b 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlot.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlot.java
@@ -36,7 +36,7 @@
  * Represents an area to display an objective.
  */
 @CatalogedBy(DisplaySlots.class)
-public interface DisplaySlot extends DefaultedRegistryValue {
+public interface DisplaySlot extends DefaultedRegistryValue<DisplaySlot> {
 
     /**
      * Finds and retrieves the sidebar display slot for the specified
diff --git a/src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayMode.java b/src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayMode.java
index 14a757c3ef6..2ff46166994 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayMode.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayMode.java
@@ -32,6 +32,6 @@
  * Represents the mode in which to display scores for an {@link Objective}.
  */
 @CatalogedBy(ObjectiveDisplayModes.class)
-public interface ObjectiveDisplayMode extends DefaultedRegistryValue {
+public interface ObjectiveDisplayMode extends DefaultedRegistryValue<ObjectiveDisplayMode> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/service/ban/BanType.java b/src/main/java/org/spongepowered/api/service/ban/BanType.java
index 09895361312..cce561b99de 100644
--- a/src/main/java/org/spongepowered/api/service/ban/BanType.java
+++ b/src/main/java/org/spongepowered/api/service/ban/BanType.java
@@ -31,7 +31,7 @@
  * Represents the possible types of bans.
  */
 @CatalogedBy(BanTypes.class)
-public interface BanType extends DefaultedRegistryValue {
+public interface BanType extends DefaultedRegistryValue<BanType> {
 
     /**
      * Gets the {@link Ban} class that this type represents.
diff --git a/src/main/java/org/spongepowered/api/service/economy/Currency.java b/src/main/java/org/spongepowered/api/service/economy/Currency.java
index 4b8c6f4b611..4eae4ce184f 100644
--- a/src/main/java/org/spongepowered/api/service/economy/Currency.java
+++ b/src/main/java/org/spongepowered/api/service/economy/Currency.java
@@ -40,7 +40,7 @@
  *
  * <p>Depending on the provider of the {@link EconomyService}, more currencies may be available.</p>
  */
-public interface Currency extends DefaultedRegistryValue {
+public interface Currency extends DefaultedRegistryValue<Currency> {
 
     /**
      * The currency's display name, in singular form. Ex: Dollar.
diff --git a/src/main/java/org/spongepowered/api/service/economy/account/AccountDeletionResultType.java b/src/main/java/org/spongepowered/api/service/economy/account/AccountDeletionResultType.java
index 38007fc4335..c3095ad28b7 100644
--- a/src/main/java/org/spongepowered/api/service/economy/account/AccountDeletionResultType.java
+++ b/src/main/java/org/spongepowered/api/service/economy/account/AccountDeletionResultType.java
@@ -31,7 +31,7 @@
  * Indicates whether the deletion of an {@link Account} succeeded.
  */
 @CatalogedBy(AccountDeletionResultTypes.class)
-public interface AccountDeletionResultType extends DefaultedRegistryValue {
+public interface AccountDeletionResultType extends DefaultedRegistryValue<AccountDeletionResultType> {
 
     /**
      * Returns whether this result type represents a successful deletion.
diff --git a/src/main/java/org/spongepowered/api/service/economy/transaction/TransactionType.java b/src/main/java/org/spongepowered/api/service/economy/transaction/TransactionType.java
index 542e0e8949c..9e84fa1f26b 100644
--- a/src/main/java/org/spongepowered/api/service/economy/transaction/TransactionType.java
+++ b/src/main/java/org/spongepowered/api/service/economy/transaction/TransactionType.java
@@ -31,6 +31,6 @@
  * Represents the type of a transaction.
  */
 @CatalogedBy(TransactionTypes.class)
-public interface TransactionType extends DefaultedRegistryValue {
+public interface TransactionType extends DefaultedRegistryValue<TransactionType> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/util/mirror/Mirror.java b/src/main/java/org/spongepowered/api/util/mirror/Mirror.java
index 96543f071b1..1d490045a44 100644
--- a/src/main/java/org/spongepowered/api/util/mirror/Mirror.java
+++ b/src/main/java/org/spongepowered/api/util/mirror/Mirror.java
@@ -28,6 +28,6 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(Mirrors.class)
-public interface Mirror extends DefaultedRegistryValue {
+public interface Mirror extends DefaultedRegistryValue<Mirror> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/util/orientation/Orientation.java b/src/main/java/org/spongepowered/api/util/orientation/Orientation.java
index c2fe1574719..bb745c3fa72 100644
--- a/src/main/java/org/spongepowered/api/util/orientation/Orientation.java
+++ b/src/main/java/org/spongepowered/api/util/orientation/Orientation.java
@@ -34,7 +34,7 @@
  * Represents an orientation in relative for an ItemFrame as an example.
  */
 @CatalogedBy(Orientations.class)
-public interface Orientation extends DefaultedRegistryValue {
+public interface Orientation extends DefaultedRegistryValue<Orientation> {
 
     /**
      * Gets the {@link Orientation} that represents the provided {@link Angle}.
diff --git a/src/main/java/org/spongepowered/api/util/rotation/Rotation.java b/src/main/java/org/spongepowered/api/util/rotation/Rotation.java
index 1c03888f80a..ace88c1676b 100644
--- a/src/main/java/org/spongepowered/api/util/rotation/Rotation.java
+++ b/src/main/java/org/spongepowered/api/util/rotation/Rotation.java
@@ -30,7 +30,7 @@
 import org.spongepowered.math.matrix.Matrix4d;
 
 @CatalogedBy(Rotations.class)
-public interface Rotation extends DefaultedRegistryValue {
+public interface Rotation extends DefaultedRegistryValue<Rotation> {
 
     Rotation and(final Rotation rotation);
 
diff --git a/src/main/java/org/spongepowered/api/world/ChunkRegenerateFlag.java b/src/main/java/org/spongepowered/api/world/ChunkRegenerateFlag.java
index 2a664bb49fc..cec31697f08 100644
--- a/src/main/java/org/spongepowered/api/world/ChunkRegenerateFlag.java
+++ b/src/main/java/org/spongepowered/api/world/ChunkRegenerateFlag.java
@@ -32,7 +32,7 @@
  * various tasks such as creating a chunk, or preserving entities.
  */
 @CatalogedBy(ChunkRegenerateFlags.class)
-public interface ChunkRegenerateFlag extends DefaultedRegistryValue {
+public interface ChunkRegenerateFlag extends DefaultedRegistryValue<ChunkRegenerateFlag> {
 
     /**
      * Gets whether this flag defines that a chunk should be created if it does
diff --git a/src/main/java/org/spongepowered/api/world/HeightType.java b/src/main/java/org/spongepowered/api/world/HeightType.java
index 6f8a4b273e6..7ce2d00920f 100644
--- a/src/main/java/org/spongepowered/api/world/HeightType.java
+++ b/src/main/java/org/spongepowered/api/world/HeightType.java
@@ -30,7 +30,7 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(HeightTypes.class)
-public interface HeightType extends DefaultedRegistryValue {
+public interface HeightType extends DefaultedRegistryValue<HeightType> {
 
     BlockReaderAwareMatcher<BlockState> matcher();
 
diff --git a/src/main/java/org/spongepowered/api/world/LightType.java b/src/main/java/org/spongepowered/api/world/LightType.java
index bccccb6f9ae..6c4512d2bf9 100644
--- a/src/main/java/org/spongepowered/api/world/LightType.java
+++ b/src/main/java/org/spongepowered/api/world/LightType.java
@@ -29,7 +29,7 @@
 import org.spongepowered.api.world.volume.game.EnvironmentalVolume;
 
 @CatalogedBy(LightTypes.class)
-public interface LightType extends DefaultedRegistryValue {
+public interface LightType extends DefaultedRegistryValue<LightType> {
 
     /**
      * Gets the default light value for this light type. Useful
diff --git a/src/main/java/org/spongepowered/api/world/WorldType.java b/src/main/java/org/spongepowered/api/world/WorldType.java
index 494d813d1c3..417b4cd4300 100644
--- a/src/main/java/org/spongepowered/api/world/WorldType.java
+++ b/src/main/java/org/spongepowered/api/world/WorldType.java
@@ -35,7 +35,7 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(WorldTypes.class)
-public interface WorldType extends DefaultedRegistryValue, ContextSource, WorldTypeDataFetcher, DataPackSerializable {
+public interface WorldType extends DefaultedRegistryValue<WorldType>, ContextSource, WorldTypeDataFetcher, DataPackSerializable {
 
     static WorldType.Builder builder() {
         return Sponge.game().builderProvider().provide(WorldType.Builder.class);
diff --git a/src/main/java/org/spongepowered/api/world/biome/Biome.java b/src/main/java/org/spongepowered/api/world/biome/Biome.java
index 5f9ea835239..18323b9dee5 100644
--- a/src/main/java/org/spongepowered/api/world/biome/Biome.java
+++ b/src/main/java/org/spongepowered/api/world/biome/Biome.java
@@ -60,7 +60,7 @@
  * Represents a biome.
  */
 @CatalogedBy(Biomes.class)
-public interface Biome extends DefaultedRegistryValue, DataHolder, Taggable<Biome>, DataPackSerializable {
+public interface Biome extends DefaultedRegistryValue<Biome>, DataHolder, Taggable<Biome>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link Biome}.
diff --git a/src/main/java/org/spongepowered/api/world/chunk/ChunkState.java b/src/main/java/org/spongepowered/api/world/chunk/ChunkState.java
index beb2266f037..96b249915c0 100644
--- a/src/main/java/org/spongepowered/api/world/chunk/ChunkState.java
+++ b/src/main/java/org/spongepowered/api/world/chunk/ChunkState.java
@@ -37,7 +37,7 @@
  * </ul>
  */
 @CatalogedBy(ChunkStates.class)
-public interface ChunkState extends DefaultedRegistryValue {
+public interface ChunkState extends DefaultedRegistryValue<ChunkState> {
 
     /**
      * Checks whether this state is considered "after"
diff --git a/src/main/java/org/spongepowered/api/world/difficulty/Difficulty.java b/src/main/java/org/spongepowered/api/world/difficulty/Difficulty.java
index fd56ea5ca74..b2422cb2dee 100644
--- a/src/main/java/org/spongepowered/api/world/difficulty/Difficulty.java
+++ b/src/main/java/org/spongepowered/api/world/difficulty/Difficulty.java
@@ -32,6 +32,6 @@
  * Represents a possible difficulty setting.
  */
 @CatalogedBy(Difficulties.class)
-public interface Difficulty extends DefaultedRegistryValue, ComponentLike {
+public interface Difficulty extends DefaultedRegistryValue<Difficulty>, ComponentLike {
 
 }
diff --git a/src/main/java/org/spongepowered/api/world/gamerule/GameRule.java b/src/main/java/org/spongepowered/api/world/gamerule/GameRule.java
index 39f2e411c52..7c3688cd6da 100644
--- a/src/main/java/org/spongepowered/api/world/gamerule/GameRule.java
+++ b/src/main/java/org/spongepowered/api/world/gamerule/GameRule.java
@@ -37,7 +37,7 @@
  * @param <V> The type of the value
  */
 @CatalogedBy(GameRules.class)
-public interface GameRule<V> extends DefaultedRegistryValue, Nameable {
+public interface GameRule<V> extends DefaultedRegistryValue<GameRule<?>>, Nameable {
 
     /**
      * Gets the value {@link TypeToken type}.
diff --git a/src/main/java/org/spongepowered/api/world/generation/carver/Carver.java b/src/main/java/org/spongepowered/api/world/generation/carver/Carver.java
index ab2869d2762..56a5ca57eb7 100644
--- a/src/main/java/org/spongepowered/api/world/generation/carver/Carver.java
+++ b/src/main/java/org/spongepowered/api/world/generation/carver/Carver.java
@@ -35,7 +35,7 @@
  * A carver used in world generation.
  */
 @CatalogedBy(Carvers.class)
-public interface Carver extends DefaultedRegistryValue, DataPackSerializable {
+public interface Carver extends DefaultedRegistryValue<Carver>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link Carver}.
diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunction.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunction.java
index 5179d5057f7..1307280fc4f 100644
--- a/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunction.java
+++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunction.java
@@ -30,7 +30,7 @@
 import org.spongepowered.math.vector.Vector3i;
 
 @CatalogedBy(DensityFunctions.class)
-public interface DensityFunction extends DefaultedRegistryValue, DataPackSerializable {
+public interface DensityFunction extends DefaultedRegistryValue<DensityFunction>, DataPackSerializable {
 
     /**
      * Returns the minimum value possible.
diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/Noise.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/Noise.java
index d7d186a8df0..85f4430b5b1 100644
--- a/src/main/java/org/spongepowered/api/world/generation/config/noise/Noise.java
+++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/Noise.java
@@ -37,7 +37,7 @@
  * Noise used in world generation
  */
 @CatalogedBy(Noises.class)
-public interface Noise extends DefaultedRegistryValue, DataPackSerializable {
+public interface Noise extends DefaultedRegistryValue<Noise>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link Noise}.
diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfig.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfig.java
index 0be8fb94430..b0db9609316 100644
--- a/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfig.java
+++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfig.java
@@ -43,7 +43,7 @@
  * Noise generator config used in {@link ConfigurableChunkGenerator configurable chunk generators}.
  */
 @CatalogedBy(NoiseGeneratorConfigs.class)
-public interface NoiseGeneratorConfig extends ChunkGeneratorConfig, DefaultedRegistryValue, DataPackSerializable {
+public interface NoiseGeneratorConfig extends ChunkGeneratorConfig, DefaultedRegistryValue<NoiseGeneratorConfig>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link NoiseGeneratorConfig}.
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/Feature.java b/src/main/java/org/spongepowered/api/world/generation/feature/Feature.java
index 5434a4db0c8..a18e4a3d6e9 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/Feature.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/Feature.java
@@ -41,7 +41,7 @@
  * <p>Features are used in world generation as a part of {@link PlacedFeature placed features}</p>
  */
 @CatalogedBy(Features.class)
-public interface Feature extends DefaultedRegistryValue, DataPackSerializable {
+public interface Feature extends DefaultedRegistryValue<Feature>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link Feature}.
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/FeatureType.java b/src/main/java/org/spongepowered/api/world/generation/feature/FeatureType.java
index ccc74f558bd..73813c7e9bb 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/FeatureType.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/FeatureType.java
@@ -29,7 +29,7 @@
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(FeatureTypes.class)
-public interface FeatureType extends DefaultedRegistryValue {
+public interface FeatureType extends DefaultedRegistryValue<FeatureType> {
 
     /**
      * Returns the configured feature
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeature.java b/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeature.java
index 417267af432..fb983833939 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeature.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeature.java
@@ -41,7 +41,7 @@
  * <p>Modifiers can impact position, rarity, count and more.</p>
  */
 @CatalogedBy(PlacedFeatures.class)
-public interface PlacedFeature extends DefaultedRegistryValue, DataPackSerializable {
+public interface PlacedFeature extends DefaultedRegistryValue<PlacedFeature>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link PlacedFeature}.
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/Structure.java b/src/main/java/org/spongepowered/api/world/generation/structure/Structure.java
index 9246e4cd491..e3bbd90de4a 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/Structure.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/Structure.java
@@ -44,7 +44,7 @@
  * A structure used in world generation.
  */
 @CatalogedBy(Structures.class)
-public interface Structure extends DefaultedRegistryValue, DataPackSerializable {
+public interface Structure extends DefaultedRegistryValue<Structure>, DataPackSerializable {
 
     /**
      * Places the structure at given position and world
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/StructureSet.java b/src/main/java/org/spongepowered/api/world/generation/structure/StructureSet.java
index 76c9156b3cf..e562f2427ed 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/StructureSet.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/StructureSet.java
@@ -36,7 +36,7 @@
  * A weighted list of {@link Structure structures}.
  */
 @CatalogedBy(StructureSets.class)
-public interface StructureSet extends DefaultedRegistryValue, DataPackSerializable {
+public interface StructureSet extends DefaultedRegistryValue<StructureSet>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link StructureSet}.
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/StructureType.java b/src/main/java/org/spongepowered/api/world/generation/structure/StructureType.java
index 3bdbdf27d5a..315834472ef 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/StructureType.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/StructureType.java
@@ -32,7 +32,7 @@
  * A type of {@link Structure}
  */
 @CatalogedBy(StructureTypes.class)
-public interface StructureType extends DefaultedRegistryValue {
+public interface StructureType extends DefaultedRegistryValue<StructureType> {
 
     /**
      * Returns the configured structure
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPool.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPool.java
index 659f2886a96..c05d328c5fe 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPool.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPool.java
@@ -39,7 +39,7 @@
  * A pool to generate {@link Structure structures} using jigsaw blocks.
  */
 @CatalogedBy(JigsawPools.class)
-public interface JigsawPool extends DefaultedRegistryValue, DataPackSerializable {
+public interface JigsawPool extends DefaultedRegistryValue<JigsawPool>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link JigsawPool}.
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorList.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorList.java
index 5d85731d14b..397cd6ae58c 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorList.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorList.java
@@ -37,7 +37,7 @@
  * A list of {@link Processor processors}.
  */
 @CatalogedBy(ProcessorLists.class)
-public interface ProcessorList extends DefaultedRegistryValue, DataPackSerializable {
+public interface ProcessorList extends DefaultedRegistryValue<ProcessorList>, DataPackSerializable {
 
     /**
      * Creates a new {@link Builder} to create a {@link ProcessorList}.
diff --git a/src/main/java/org/spongepowered/api/world/schematic/PaletteType.java b/src/main/java/org/spongepowered/api/world/schematic/PaletteType.java
index dbc39b6f871..9a8abf58ef6 100644
--- a/src/main/java/org/spongepowered/api/world/schematic/PaletteType.java
+++ b/src/main/java/org/spongepowered/api/world/schematic/PaletteType.java
@@ -35,7 +35,7 @@
 import java.util.function.BiFunction;
 
 @CatalogedBy(PaletteTypes.class)
-public interface PaletteType<T, R> extends DefaultedRegistryValue {
+public interface PaletteType<T, R> extends DefaultedRegistryValue<PaletteType<?, ?>> {
 
     @SuppressWarnings("unchecked")
     static <E, ER> Builder<E, ER> builder() {
diff --git a/src/main/java/org/spongepowered/api/world/server/WorldArchetypeType.java b/src/main/java/org/spongepowered/api/world/server/WorldArchetypeType.java
index 487c2322181..ee7376786f8 100644
--- a/src/main/java/org/spongepowered/api/world/server/WorldArchetypeType.java
+++ b/src/main/java/org/spongepowered/api/world/server/WorldArchetypeType.java
@@ -32,7 +32,7 @@
 import org.spongepowered.api.world.generation.ChunkGenerator;
 
 @CatalogedBy(WorldArchetypeTypes.class)
-public interface WorldArchetypeType extends DefaultedRegistryValue, DataPackSerializable {
+public interface WorldArchetypeType extends DefaultedRegistryValue<WorldArchetypeType>, DataPackSerializable {
 
     static WorldArchetypeType.Builder builder() {
         return Sponge.game().builderProvider().provide(WorldArchetypeType.Builder.class);
diff --git a/src/main/java/org/spongepowered/api/world/teleport/TeleportHelperFilter.java b/src/main/java/org/spongepowered/api/world/teleport/TeleportHelperFilter.java
index 1a889d346bd..374c5e93cc4 100644
--- a/src/main/java/org/spongepowered/api/world/teleport/TeleportHelperFilter.java
+++ b/src/main/java/org/spongepowered/api/world/teleport/TeleportHelperFilter.java
@@ -37,7 +37,7 @@
  * location is a suitable candidate for teleporting to safely.
  */
 @CatalogedBy(TeleportHelperFilters.class)
-public interface TeleportHelperFilter extends DefaultedRegistryValue {
+public interface TeleportHelperFilter extends DefaultedRegistryValue<TeleportHelperFilter> {
 
     /**
      * Tests whether the location in question is valid, regardless of whether
diff --git a/src/main/java/org/spongepowered/api/world/weather/WeatherType.java b/src/main/java/org/spongepowered/api/world/weather/WeatherType.java
index 0cd7e8dd5b1..10d3d8c4fe6 100644
--- a/src/main/java/org/spongepowered/api/world/weather/WeatherType.java
+++ b/src/main/java/org/spongepowered/api/world/weather/WeatherType.java
@@ -31,6 +31,6 @@
  * Represents a type of weather.
  */
 @CatalogedBy(WeatherTypes.class)
-public interface WeatherType extends DefaultedRegistryValue {
+public interface WeatherType extends DefaultedRegistryValue<WeatherType> {
 
 }

From 306dd58e83592e77764d33f55f82b520d32c99d6 Mon Sep 17 00:00:00 2001
From: MrHell228 <artemkz2016@gmail.com>
Date: Sun, 6 Apr 2025 01:56:58 +0300
Subject: [PATCH 3/6] add missing DefaultedRegistryValue

---
 .../java/org/spongepowered/api/adventure/ResolveOperation.java | 3 ++-
 .../api/command/parameter/managed/operator/Operator.java       | 3 ++-
 src/main/java/org/spongepowered/api/data/type/FrogType.java    | 3 ++-
 .../java/org/spongepowered/api/data/type/PushReaction.java     | 3 ++-
 .../org/spongepowered/api/data/type/TrialSpawnerState.java     | 3 ++-
 src/main/java/org/spongepowered/api/data/type/VaultState.java  | 3 ++-
 .../java/org/spongepowered/api/effect/sound/SoundType.java     | 3 ++-
 src/main/java/org/spongepowered/api/item/ItemRarity.java       | 3 ++-
 src/main/java/org/spongepowered/api/statistic/Statistic.java   | 3 ++-
 .../org/spongepowered/api/statistic/StatisticCategory.java     | 3 ++-
 .../api/world/biome/climate/GrassColorModifier.java            | 3 ++-
 .../spongepowered/api/world/biome/climate/Precipitation.java   | 3 ++-
 .../api/world/biome/climate/TemperatureModifier.java           | 3 ++-
 .../api/world/explosion/ExplosionBlockInteraction.java         | 3 ++-
 .../spongepowered/api/world/generation/carver/CarverType.java  | 3 ++-
 .../api/world/generation/config/flat/FlatGeneratorConfig.java  | 3 ++-
 .../api/world/generation/feature/DecorationStep.java           | 3 ++-
 .../api/world/generation/feature/PlacementModifierType.java    | 3 ++-
 .../api/world/generation/structure/jigsaw/ProcessorType.java   | 3 ++-
 19 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/spongepowered/api/adventure/ResolveOperation.java b/src/main/java/org/spongepowered/api/adventure/ResolveOperation.java
index 6564a2f613a..d90a4e35c4d 100644
--- a/src/main/java/org/spongepowered/api/adventure/ResolveOperation.java
+++ b/src/main/java/org/spongepowered/api/adventure/ResolveOperation.java
@@ -24,12 +24,13 @@
  */
 package org.spongepowered.api.adventure;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * A type of rendering operation that can be performed on a component.
  */
 @CatalogedBy(ResolveOperations.class)
-public interface ResolveOperation {
+public interface ResolveOperation extends DefaultedRegistryValue<ResolveOperation> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/command/parameter/managed/operator/Operator.java b/src/main/java/org/spongepowered/api/command/parameter/managed/operator/Operator.java
index 725c39e6779..a36ffb3121b 100644
--- a/src/main/java/org/spongepowered/api/command/parameter/managed/operator/Operator.java
+++ b/src/main/java/org/spongepowered/api/command/parameter/managed/operator/Operator.java
@@ -25,6 +25,7 @@
 package org.spongepowered.api.command.parameter.managed.operator;
 
 import org.spongepowered.api.command.parameter.managed.standard.ResourceKeyedValueParameters;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
@@ -33,7 +34,7 @@
  * @see ResourceKeyedValueParameters#OPERATOR
  */
 @CatalogedBy(Operators.class)
-public interface Operator {
+public interface Operator extends DefaultedRegistryValue<Operator> {
 
     /**
      * The string representation of this operator
diff --git a/src/main/java/org/spongepowered/api/data/type/FrogType.java b/src/main/java/org/spongepowered/api/data/type/FrogType.java
index 22c9a584b25..0e9d6ae27f9 100644
--- a/src/main/java/org/spongepowered/api/data/type/FrogType.java
+++ b/src/main/java/org/spongepowered/api/data/type/FrogType.java
@@ -24,8 +24,9 @@
  */
 package org.spongepowered.api.data.type;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(FrogTypes.class)
-public interface FrogType {
+public interface FrogType extends DefaultedRegistryValue<FrogType> {
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/PushReaction.java b/src/main/java/org/spongepowered/api/data/type/PushReaction.java
index 374eb454a12..940fd072394 100644
--- a/src/main/java/org/spongepowered/api/data/type/PushReaction.java
+++ b/src/main/java/org/spongepowered/api/data/type/PushReaction.java
@@ -24,9 +24,10 @@
  */
 package org.spongepowered.api.data.type;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(PushReactions.class)
-public interface PushReaction {
+public interface PushReaction extends DefaultedRegistryValue<PushReaction> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/TrialSpawnerState.java b/src/main/java/org/spongepowered/api/data/type/TrialSpawnerState.java
index 504d2ecacc0..cb4e9c7d36f 100644
--- a/src/main/java/org/spongepowered/api/data/type/TrialSpawnerState.java
+++ b/src/main/java/org/spongepowered/api/data/type/TrialSpawnerState.java
@@ -24,9 +24,10 @@
  */
 package org.spongepowered.api.data.type;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(TrialSpawnerStates.class)
-public interface TrialSpawnerState extends Comparable<TrialSpawnerState>, StringRepresentable {
+public interface TrialSpawnerState extends DefaultedRegistryValue<TrialSpawnerState>, Comparable<TrialSpawnerState>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/type/VaultState.java b/src/main/java/org/spongepowered/api/data/type/VaultState.java
index b80f20a53df..57d754d1cfa 100644
--- a/src/main/java/org/spongepowered/api/data/type/VaultState.java
+++ b/src/main/java/org/spongepowered/api/data/type/VaultState.java
@@ -24,9 +24,10 @@
  */
 package org.spongepowered.api.data.type;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(VaultStates.class)
-public interface VaultState extends Comparable<VaultState>, StringRepresentable {
+public interface VaultState extends DefaultedRegistryValue<VaultState>, Comparable<VaultState>, StringRepresentable {
 
 }
diff --git a/src/main/java/org/spongepowered/api/effect/sound/SoundType.java b/src/main/java/org/spongepowered/api/effect/sound/SoundType.java
index 188f0e6af6f..1c3f0af8dce 100644
--- a/src/main/java/org/spongepowered/api/effect/sound/SoundType.java
+++ b/src/main/java/org/spongepowered/api/effect/sound/SoundType.java
@@ -27,6 +27,7 @@
 import net.kyori.adventure.sound.Sound;
 import org.spongepowered.api.ResourceKeyed;
 import org.spongepowered.api.Sponge;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.ResourceKeyedBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
@@ -34,7 +35,7 @@
  * Represents a sound that can be heard on clients.
  */
 @CatalogedBy(SoundTypes.class)
-public interface SoundType extends ResourceKeyed, Sound.Type {
+public interface SoundType extends DefaultedRegistryValue<SoundType>, ResourceKeyed, Sound.Type {
 
     /**
      * Creates a new {@link Builder} for building SoundTypes.
diff --git a/src/main/java/org/spongepowered/api/item/ItemRarity.java b/src/main/java/org/spongepowered/api/item/ItemRarity.java
index e55177bd4a0..b297d599512 100644
--- a/src/main/java/org/spongepowered/api/item/ItemRarity.java
+++ b/src/main/java/org/spongepowered/api/item/ItemRarity.java
@@ -25,13 +25,14 @@
 package org.spongepowered.api.item;
 
 import net.kyori.adventure.text.format.TextColor;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * The rarity of an item.
  */
 @CatalogedBy(ItemRarities.class)
-public interface ItemRarity {
+public interface ItemRarity extends DefaultedRegistryValue<ItemRarity> {
 
     /**
      * Gets the {@link TextColor} used to decorate tooltips of items with this {@link ItemRarity}.
diff --git a/src/main/java/org/spongepowered/api/statistic/Statistic.java b/src/main/java/org/spongepowered/api/statistic/Statistic.java
index b52c416f801..852e1eecd61 100644
--- a/src/main/java/org/spongepowered/api/statistic/Statistic.java
+++ b/src/main/java/org/spongepowered/api/statistic/Statistic.java
@@ -24,6 +24,7 @@
  */
 package org.spongepowered.api.statistic;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.scoreboard.criteria.Criterion;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
@@ -34,7 +35,7 @@
  * Represents some statistic in minecraft.
  */
 @CatalogedBy(Statistics.class)
-public interface Statistic {
+public interface Statistic extends DefaultedRegistryValue<Statistic> {
 
     /**
      * Returns the objective {@link Criterion} for this statistic.
diff --git a/src/main/java/org/spongepowered/api/statistic/StatisticCategory.java b/src/main/java/org/spongepowered/api/statistic/StatisticCategory.java
index 5611afcd8a8..99fb9d90759 100644
--- a/src/main/java/org/spongepowered/api/statistic/StatisticCategory.java
+++ b/src/main/java/org/spongepowered/api/statistic/StatisticCategory.java
@@ -25,12 +25,13 @@
 package org.spongepowered.api.statistic;
 
 import io.leangen.geantyref.TypeToken;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 import java.util.Collection;
 
 @CatalogedBy(StatisticCategories.class)
-public interface StatisticCategory {
+public interface StatisticCategory extends DefaultedRegistryValue<StatisticCategory> {
 
     /**
      * Gets all the {@link Statistic}s that are listed
diff --git a/src/main/java/org/spongepowered/api/world/biome/climate/GrassColorModifier.java b/src/main/java/org/spongepowered/api/world/biome/climate/GrassColorModifier.java
index bef9d2ff2eb..6d725c56bc0 100644
--- a/src/main/java/org/spongepowered/api/world/biome/climate/GrassColorModifier.java
+++ b/src/main/java/org/spongepowered/api/world/biome/climate/GrassColorModifier.java
@@ -24,6 +24,7 @@
  */
 package org.spongepowered.api.world.biome.climate;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 import org.spongepowered.api.world.biome.Biome;
 
@@ -31,6 +32,6 @@
  * A modifier for grass color in a {@link Biome}
  */
 @CatalogedBy(GrassColorModifiers.class)
-public interface GrassColorModifier {
+public interface GrassColorModifier extends DefaultedRegistryValue<GrassColorModifier> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/world/biome/climate/Precipitation.java b/src/main/java/org/spongepowered/api/world/biome/climate/Precipitation.java
index 2209c0c0b25..56c0e8fb12d 100644
--- a/src/main/java/org/spongepowered/api/world/biome/climate/Precipitation.java
+++ b/src/main/java/org/spongepowered/api/world/biome/climate/Precipitation.java
@@ -24,6 +24,7 @@
  */
 package org.spongepowered.api.world.biome.climate;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 import org.spongepowered.api.world.biome.Biome;
 
@@ -31,6 +32,6 @@
  * The type of precipitation in a {@link Biome}.
  */
 @CatalogedBy(Precipitations.class)
-public interface Precipitation {
+public interface Precipitation extends DefaultedRegistryValue<Precipitation> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/world/biome/climate/TemperatureModifier.java b/src/main/java/org/spongepowered/api/world/biome/climate/TemperatureModifier.java
index 823982b2e82..549e5ab227a 100644
--- a/src/main/java/org/spongepowered/api/world/biome/climate/TemperatureModifier.java
+++ b/src/main/java/org/spongepowered/api/world/biome/climate/TemperatureModifier.java
@@ -24,12 +24,13 @@
  */
 package org.spongepowered.api.world.biome.climate;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * The temperature modifier of a biome
  */
 @CatalogedBy(TemperatureModifiers.class)
-public interface TemperatureModifier {
+public interface TemperatureModifier extends DefaultedRegistryValue<TemperatureModifier> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/world/explosion/ExplosionBlockInteraction.java b/src/main/java/org/spongepowered/api/world/explosion/ExplosionBlockInteraction.java
index ac030daaae5..44567c53770 100644
--- a/src/main/java/org/spongepowered/api/world/explosion/ExplosionBlockInteraction.java
+++ b/src/main/java/org/spongepowered/api/world/explosion/ExplosionBlockInteraction.java
@@ -24,10 +24,11 @@
  */
 package org.spongepowered.api.world.explosion;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 @CatalogedBy(ExplosionBlockInteractions.class)
-public interface ExplosionBlockInteraction {
+public interface ExplosionBlockInteraction extends DefaultedRegistryValue<ExplosionBlockInteraction> {
     // TODO mixin
 
 }
diff --git a/src/main/java/org/spongepowered/api/world/generation/carver/CarverType.java b/src/main/java/org/spongepowered/api/world/generation/carver/CarverType.java
index 0f19d5cddb6..d83168f1683 100644
--- a/src/main/java/org/spongepowered/api/world/generation/carver/CarverType.java
+++ b/src/main/java/org/spongepowered/api/world/generation/carver/CarverType.java
@@ -25,13 +25,14 @@
 package org.spongepowered.api.world.generation.carver;
 
 import org.spongepowered.api.data.persistence.DataView;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * A type of {@link Carver}.
  */
 @CatalogedBy(CarverTypes.class)
-public interface CarverType {
+public interface CarverType extends DefaultedRegistryValue<CarverType> {
 
     /**
      * Returns the configured carver
diff --git a/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfig.java b/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfig.java
index 238e49520a5..03e8c95fc23 100644
--- a/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfig.java
+++ b/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfig.java
@@ -26,6 +26,7 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.Sponge;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryReference;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.util.annotation.CatalogedBy;
@@ -41,7 +42,7 @@
  * See {@link FlatGeneratorConfigs} for the vanilla provided presets.
  */
 @CatalogedBy(FlatGeneratorConfigs.class)
-public interface FlatGeneratorConfig extends ChunkGeneratorConfig {
+public interface FlatGeneratorConfig extends ChunkGeneratorConfig, DefaultedRegistryValue<FlatGeneratorConfig> {
 
     static Builder builder() {
         return Sponge.game().builderProvider().provide(Builder.class);
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/DecorationStep.java b/src/main/java/org/spongepowered/api/world/generation/feature/DecorationStep.java
index a7f0c057286..ab832819cbd 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/DecorationStep.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/DecorationStep.java
@@ -24,6 +24,7 @@
  */
 package org.spongepowered.api.world.generation.feature;
 
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 import org.spongepowered.api.world.biome.Biome;
 
@@ -31,6 +32,6 @@
  * A step in which {@link PlacedFeature features} are placed for a {@link Biome} during world generation.
  */
 @CatalogedBy(DecorationSteps.class)
-public interface DecorationStep {
+public interface DecorationStep extends DefaultedRegistryValue<DecorationStep> {
 
 }
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierType.java b/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierType.java
index a6a90e02ead..78f7a8ced42 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierType.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierType.java
@@ -25,13 +25,14 @@
 package org.spongepowered.api.world.generation.feature;
 
 import org.spongepowered.api.data.persistence.DataView;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * A type of {@link PlacementModifier}.
  */
 @CatalogedBy(PlacementModifierTypes.class)
-public interface PlacementModifierType {
+public interface PlacementModifierType extends DefaultedRegistryValue<PlacementModifierType> {
 
     /**
      * Returns the placement modifier.
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorType.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorType.java
index a5763e5ece7..6b11aa7d069 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorType.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorType.java
@@ -25,6 +25,7 @@
 package org.spongepowered.api.world.generation.structure.jigsaw;
 
 import org.spongepowered.api.data.persistence.DataView;
+import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 import java.io.IOException;
@@ -33,7 +34,7 @@
  * A type of {@link Processor}.
  */
 @CatalogedBy(ProcessorTypes.class)
-public interface ProcessorType {
+public interface ProcessorType extends DefaultedRegistryValue<ProcessorType> {
 
     /**
      * Returns the configured processor.

From d921b9540e3d011b6eb77fa1a76b199cd5522113 Mon Sep 17 00:00:00 2001
From: MrHell228 <artemkz2016@gmail.com>
Date: Sun, 6 Apr 2025 02:20:11 +0300
Subject: [PATCH 4/6] fix some registry types being not defaulted

---
 .../java/org/spongepowered/api/registry/RegistryTypes.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
index 4f2155b98c5..c860f0ba653 100644
--- a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
+++ b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
@@ -348,7 +348,9 @@ public final class RegistryTypes {
     public static final DefaultedRegistryType<DamageModifierType> DAMAGE_MODIFIER_TYPE = RegistryTypes.spongeKeyInGame("damage_modifier_type");
 
     public static final DefaultedRegistryType<DamageType> DAMAGE_TYPE = RegistryTypes.minecraftKeyInServer("damage_type");
+
     public static final DefaultedRegistryType<DamageScaling> DAMAGE_SCALING = RegistryTypes.spongeKeyInGame("damage_scaling");
+
     public static final DefaultedRegistryType<DamageEffect> DAMAGE_EFFECT = RegistryTypes.spongeKeyInGame("damage_effect");
 
     public static final DefaultedRegistryType<DataFormat> DATA_FORMAT = RegistryTypes.spongeKeyInGame("data_format");
@@ -373,7 +375,7 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<EquipmentType> EQUIPMENT_TYPE = RegistryTypes.spongeKeyInGame("equipment_type");
 
-    public static final RegistryType<ExplosionBlockInteraction> EXPLOSION_BLOCK_INTERACTION = RegistryTypes.spongeKeyInGame("explosion_block_interaction");
+    public static final DefaultedRegistryType<ExplosionBlockInteraction> EXPLOSION_BLOCK_INTERACTION = RegistryTypes.spongeKeyInGame("explosion_block_interaction");
 
     public static final DefaultedRegistryType<FireworkShape> FIREWORK_SHAPE = RegistryTypes.spongeKeyInGame("firework_shape");
 
@@ -517,7 +519,7 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<Tilt> TILT = RegistryTypes.spongeKeyInGame("tilt");
 
-    public static final RegistryType<VaultState> VAULT_STATE = RegistryTypes.spongeKeyInGame("vault_state");
+    public static final DefaultedRegistryType<VaultState> VAULT_STATE = RegistryTypes.spongeKeyInGame("vault_state");
 
     public static final DefaultedRegistryType<Visibility> VISIBILITY = RegistryTypes.spongeKeyInGame("visibility");
 

From c0e89e55d50979a5329f9aa12e3d5bc8bcefc29d Mon Sep 17 00:00:00 2001
From: MrHell228 <artemkz2016@gmail.com>
Date: Mon, 9 Jun 2025 01:21:47 +0300
Subject: [PATCH 5/6] Update DamageStepType.java

---
 .../api/event/cause/entity/damage/DamageStepType.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageStepType.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageStepType.java
index ca74abeadd7..b94a70b1754 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageStepType.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageStepType.java
@@ -32,7 +32,7 @@
  * Represents a type of {@link DamageStep}.
  */
 @CatalogedBy(DamageStepTypes.class)
-public interface DamageStepType extends DefaultedRegistryValue {
+public interface DamageStepType extends DefaultedRegistryValue<DamageStepType> {
 
     /**
      * Creates a new {@link DamageStepType}.

From 0e2bead5a571b255c7b2fabcb26bb4727c17b2b8 Mon Sep 17 00:00:00 2001
From: aromaa <me@joniaromaa.fi>
Date: Mon, 9 Jun 2025 02:36:35 +0300
Subject: [PATCH 6/6] Align EntityType DefaultedRegistryValue constraint

---
 src/main/java/org/spongepowered/api/entity/EntityType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/spongepowered/api/entity/EntityType.java b/src/main/java/org/spongepowered/api/entity/EntityType.java
index 0e9f2e3d301..99552ec64b4 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityType.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityType.java
@@ -34,7 +34,7 @@
  * Describes a type of entity.
  */
 @CatalogedBy(EntityTypes.class)
-public interface EntityType<A extends Entity> extends DefaultedRegistryValue<EntityType<? extends Entity>>, ComponentLike, Taggable<EntityType<? extends Entity>> {
+public interface EntityType<A extends Entity> extends DefaultedRegistryValue<EntityType<?>>, ComponentLike, Taggable<EntityType<?>> {
 
     /**
      * If true {@link Entity entities} of this type will not be saved to disk.