update DefaultRegistryValue types

Author: MrHell228

src/main/java/org/spongepowered/api/advancement/Advancement.java

@@ -31,7 +31,9 @@
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
 import org.spongepowered.api.datapack.DataPackSerializable;
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.CopyableBuilder;
 
 import java.util.List;
@@ -40,7 +42,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}.
@@ -85,6 +87,11 @@ static Advancement.Builder builder() {
      */
     List<Component> toToastText();
 
+    @Override
+    default DefaultedRegistryType<Advancement> registryType() {
+        return RegistryTypes.ADVANCEMENT;
+    }
+
     /**
      * A builder to create {@link Advancement}s.
      */

src/main/java/org/spongepowered/api/advancement/AdvancementType.java

@@ -25,15 +25,17 @@
 package org.spongepowered.api.advancement;
 
 import net.kyori.adventure.text.format.TextColor;
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Changes the frame around the {@link Advancement} icon and
  * 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.
@@ -42,4 +44,8 @@ public interface AdvancementType extends DefaultedRegistryValue {
      */
     TextColor textColor();
 
+    @Override
+    default DefaultedRegistryType<AdvancementType> registryType() {
+        return RegistryTypes.ADVANCEMENT_TYPE;
+    }
 }

src/main/java/org/spongepowered/api/block/transaction/Operation.java

@@ -24,7 +24,9 @@
  */
 package org.spongepowered.api.block.transaction;
 
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
@@ -34,5 +36,10 @@
  * 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> {
+
+    @Override
+    default DefaultedRegistryType<Operation> registryType() {
+        return RegistryTypes.OPERATION;
+    }
 }

src/main/java/org/spongepowered/api/command/parameter/managed/ValueParameter.java

@@ -31,8 +31,10 @@
 import org.spongepowered.api.command.parameter.ArgumentReader;
 import org.spongepowered.api.command.parameter.CommandContext;
 import org.spongepowered.api.command.parameter.Parameter;
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryHolder;
+import org.spongepowered.api.registry.RegistryTypes;
 
 import java.util.List;
 import java.util.Optional;
@@ -48,7 +50,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) {
@@ -60,6 +62,11 @@ default ValueParameter<T> bind(RegistryHolder registryHolder) {
         return this;
     }
 
+    @Override
+    default DefaultedRegistryType<ValueParameter<?>> registryType() {
+        return RegistryTypes.REGISTRY_KEYED_VALUE_PARAMETER;
+    }
+
     /**
      * A {@link ValueParameter} that does not rely on the {@link CommandContext}
      * or {@link Parameter.Key} to parse its results.

src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionType.java

@@ -25,7 +25,9 @@
 package org.spongepowered.api.command.parameter.managed.clientcompletion;
 
 import org.spongepowered.api.command.parameter.managed.ValueParser;
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
@@ -37,5 +39,10 @@
  * types</p>
  */
 @CatalogedBy(ClientCompletionTypes.class)
-public interface ClientCompletionType extends DefaultedRegistryValue {
+public interface ClientCompletionType extends DefaultedRegistryValue<ClientCompletionType> {
+
+    @Override
+    default DefaultedRegistryType<ClientCompletionType> registryType() {
+        return RegistryTypes.CLIENT_COMPLETION_TYPE;
+    }
 }

src/main/java/org/spongepowered/api/command/registrar/CommandRegistrarType.java

@@ -26,8 +26,10 @@
 
 import io.leangen.geantyref.TypeToken;
 import org.spongepowered.api.command.manager.CommandManager;
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.registry.RegistryHolder;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * A type of {@link CommandRegistrar}.
@@ -37,7 +39,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.
@@ -55,4 +57,9 @@ public interface CommandRegistrarType<T> extends DefaultedRegistryValue {
      * @return the newly created registrar
      */
     CommandRegistrar<T> create(final CommandManager.Mutable manager, RegistryHolder registryHolder);
+
+    @Override
+    default DefaultedRegistryType<CommandRegistrarType<?>> registryType() {
+        return RegistryTypes.COMMAND_REGISTRAR_TYPE;
+    }
 }

src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeNodeType.java

@@ -27,7 +27,9 @@
 import org.spongepowered.api.ResourceKeyed;
 import org.spongepowered.api.command.Command;
 import org.spongepowered.api.command.registrar.CommandRegistrarType;
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
@@ -55,7 +57,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
@@ -65,4 +67,8 @@ public interface CommandTreeNodeType<T extends CommandTreeNode<T>> extends Defau
      */
     T createNode();
 
+    @Override
+    default DefaultedRegistryType<CommandTreeNodeType<?>> registryType() {
+        return RegistryTypes.COMMAND_TREE_NODE_TYPE;
+    }
 }

src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithm.java

@@ -24,14 +24,20 @@
  */
 package org.spongepowered.api.command.selector;
 
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * Defines an algorithm used when a selector sorts the selected entities, which
  * 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> {
 
+    @Override
+    default DefaultedRegistryType<SelectorSortAlgorithm> registryType() {
+        return RegistryTypes.SELECTOR_SORT_ALGORITHM;
+    }
 }

src/main/java/org/spongepowered/api/command/selector/SelectorType.java

@@ -24,14 +24,16 @@
  */
 package org.spongepowered.api.command.selector;
 
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 /**
  * 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.
@@ -57,4 +59,8 @@ public interface SelectorType extends DefaultedRegistryValue {
      */
     Selector.Builder toBuilder();
 
+    @Override
+    default DefaultedRegistryType<SelectorType> registryType() {
+        return RegistryTypes.SELECTOR_TYPE;
+    }
 }

src/main/java/org/spongepowered/api/data/persistence/DataFormat.java

@@ -24,7 +24,9 @@
  */
 package org.spongepowered.api.data.persistence;
 
+import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
 import java.io.IOException;
@@ -36,7 +38,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
@@ -60,4 +62,8 @@ public interface DataFormat extends DefaultedRegistryValue {
      */
     void writeTo(OutputStream output, DataView data) throws IOException;
 
+    @Override
+    default DefaultedRegistryType<DataFormat> registryType() {
+        return RegistryTypes.DATA_FORMAT;
+    }
 }