Skip to content

Commit b487489

Browse files
committed
make DefaultedRegistryValue generic
1 parent 356e1fa commit b487489

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/org/spongepowered/api/registry/DefaultedRegistryValue.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434
* within a {@link DefaultedRegistryType defaulted registry}.
3535
*/
3636
@SuppressWarnings("unchecked")
37-
public interface DefaultedRegistryValue {
37+
public interface DefaultedRegistryValue<T extends DefaultedRegistryValue<T>> {
3838

39-
default <T> ResourceKey key(final DefaultedRegistryType<T> type) {
39+
default ResourceKey key(final DefaultedRegistryType<T> type) {
4040
return Objects.requireNonNull(type, "type").get().valueKey((T) this);
4141
}
4242

43-
default <T> Optional<ResourceKey> findKey(final DefaultedRegistryType<T> type) {
43+
default Optional<ResourceKey> findKey(final DefaultedRegistryType<T> type) {
4444
return Objects.requireNonNull(type, "type").find().flatMap(r -> r.findValueKey((T) this));
4545
}
4646

47-
default <T> DefaultedRegistryReference<T> asDefaultedReference(final DefaultedRegistryType<T> type) {
47+
default DefaultedRegistryReference<T> asDefaultedReference(final DefaultedRegistryType<T> type) {
4848
return RegistryKey.of(Objects.requireNonNull(type, "type"), this.key(type)).asDefaultedReference(type.defaultHolder());
4949
}
5050
}

src/main/java/org/spongepowered/api/tag/Taggable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/**
3434
* A type that may be included in one or more {@link Tag} collections.
3535
*/
36-
public interface Taggable<T extends Taggable<T>> extends DefaultedRegistryValue {
36+
public interface Taggable<T extends Taggable<T>> extends DefaultedRegistryValue<T> {
3737

3838
/**
3939
* Gets the {@link RegistryType} that holds the types of {@link Tag tags}

0 commit comments

Comments
 (0)