Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit c801a94

Browse files
ForgeRegistryEntry<V extends IForgeRegistryEntry<V>>, not <V> (#141)
1 parent 494fd27 commit c801a94

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistryEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import net.minecraft.util.Identifier;
2323

24-
public abstract class ForgeRegistryEntry<V> implements IForgeRegistryEntry<V> {
24+
public abstract class ForgeRegistryEntry<V extends IForgeRegistryEntry<V>> implements IForgeRegistryEntry<V> {
2525
private Identifier registryName;
2626

2727
@Override

patchwork-registries/src/main/java/net/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424

2525
import net.minecraft.util.Identifier;
2626

27+
@SuppressWarnings("unchecked")
2728
public interface ExtendedForgeRegistryEntry<V> extends IForgeRegistryEntry<V> {
28-
default V setRegistryName(String full) {
29+
default IForgeRegistryEntry<V> setRegistryName(String full) {
2930
String activeNamespace = ModLoadingContext.get().getActiveNamespace();
3031

3132
if (activeNamespace == null || activeNamespace.equals("minecraft")) {
@@ -44,10 +45,10 @@ default V setRegistryName(String full) {
4445
System.err.printf("Potentially Dangerous alternative prefix `%s` for name `%s`, expected `%s`. This could be a intended override, but in most cases indicates a broken mod.\n", identifier.getNamespace(), identifier.getPath(), activeNamespace);
4546
}
4647

47-
return this.setRegistryName(identifier);
48+
return (IForgeRegistryEntry<V>) this.setRegistryName(identifier);
4849
}
4950

50-
default V setRegistryName(String namespace, String name) {
51-
return this.setRegistryName(new Identifier(namespace, name));
51+
default IForgeRegistryEntry<V> setRegistryName(String namespace, String name) {
52+
return (IForgeRegistryEntry<V>) this.setRegistryName(new Identifier(namespace, name));
5253
}
5354
}

0 commit comments

Comments
 (0)