Skip to content

Add missing DefaultedRegistryValue #2591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: api-14
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
2 changes: 1 addition & 1 deletion src/main/java/org/spongepowered/api/block/BlockType.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
* types</p>
*/
@CatalogedBy(ClientCompletionTypes.class)
public interface ClientCompletionType extends DefaultedRegistryValue {
public interface ClientCompletionType extends DefaultedRegistryValue<ClientCompletionType> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/spongepowered/api/data/type/ArtType.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
2 changes: 1 addition & 1 deletion src/main/java/org/spongepowered/api/data/type/CatType.java
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/spongepowered/api/data/type/FoxType.java
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
3 changes: 2 additions & 1 deletion src/main/java/org/spongepowered/api/data/type/FrogType.java
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
* preference.
*/
@CatalogedBy(HandTypes.class)
public interface HandType extends DefaultedRegistryValue {
public interface HandType extends DefaultedRegistryValue<HandType> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Loading