Use raw types to "hand erase" the generics (#151)

Author: cittyinthecloud

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

@@ -25,8 +25,8 @@
 import net.minecraft.util.Identifier;
 
 @SuppressWarnings("unchecked")
-public interface ExtendedForgeRegistryEntry<V> extends IForgeRegistryEntry<V> {
-	default IForgeRegistryEntry<V> setRegistryName(String full) {
+public interface ExtendedForgeRegistryEntry<V extends IForgeRegistryEntry<V>> extends IForgeRegistryEntry<V> {
+	default V setRegistryName(String full) {
 		String activeNamespace = ModLoadingContext.get().getActiveNamespace();
 
 		if (activeNamespace == null || activeNamespace.equals("minecraft")) {
@@ -45,10 +45,13 @@ default IForgeRegistryEntry<V> setRegistryName(String full) {
 			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);
 		}
 
-		return (IForgeRegistryEntry<V>) this.setRegistryName(identifier);
+		return this.setRegistryName(identifier);
 	}
 
-	default IForgeRegistryEntry<V> setRegistryName(String namespace, String name) {
-		return (IForgeRegistryEntry<V>) this.setRegistryName(new Identifier(namespace, name));
+	default V setRegistryName(String namespace, String name) {
+		return this.setRegistryName(new Identifier(namespace, name));
 	}
+
+	@Override
+	V setRegistryName(Identifier name);
 }

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinActivity.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Activity.class)
-public class MixinActivity implements ExtendedForgeRegistryEntry<Activity> {
+public class MixinActivity implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public Activity setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (Activity) (Object) this;
+		return this;
 	}
 
 	public Identifier getRegistryName() {

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBiome.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Biome.class)
-public class MixinBiome implements ExtendedForgeRegistryEntry<Biome> {
+public class MixinBiome implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public Biome setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (Biome) (Object) this;
+		return this;
 	}
 
 	public Identifier getRegistryName() {

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBiomeSourceType.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(BiomeSourceType.class)
-public class MixinBiomeSourceType implements ExtendedForgeRegistryEntry<BiomeSourceType> {
+public class MixinBiomeSourceType implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public BiomeSourceType setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (BiomeSourceType) (Object) this;
+		return this;
 	}
 
 	public Identifier getRegistryName() {

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBlock.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Block.class)
-public class MixinBlock implements ExtendedForgeRegistryEntry<Block> {
+public class MixinBlock implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public Block setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (Block) (Object) this;
+		return this;
 	}
 
 	public Identifier getRegistryName() {

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBlockEntityType.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(BlockEntityType.class)
-public class MixinBlockEntityType implements ExtendedForgeRegistryEntry<BlockEntityType> {
+public class MixinBlockEntityType implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public BlockEntityType setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (BlockEntityType) (Object) this;
+		return this;
 	}
 
 	public Identifier getRegistryName() {

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinCarver.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Carver.class)
-public class MixinCarver implements ExtendedForgeRegistryEntry<Carver> {
+public class MixinCarver implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public Carver setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (Carver) (Object) this;
+		return this;
 	}
 
 	public Identifier getRegistryName() {

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinChunkGeneratorType.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(ChunkGeneratorType.class)
-public class MixinChunkGeneratorType implements ExtendedForgeRegistryEntry<ChunkGeneratorType> {
+public class MixinChunkGeneratorType implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public ChunkGeneratorType setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (ChunkGeneratorType) (Object) this;
+		return this;
 	}
 
 	public Identifier getRegistryName() {

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinChunkStatus.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(ChunkStatus.class)
-public class MixinChunkStatus implements ExtendedForgeRegistryEntry<ChunkStatus> {
+public class MixinChunkStatus implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public ChunkStatus setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (ChunkStatus) (Object) this;
+		return this;
 	}
 
 	public Identifier getRegistryName() {

patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinContainerType.java

@@ -19,6 +19,7 @@
 
 package net.patchworkmc.mixin.registries;
 
+import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -30,15 +31,15 @@
 import net.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(ContainerType.class)
-public class MixinContainerType implements ExtendedForgeRegistryEntry<ContainerType> {
+public class MixinContainerType implements ExtendedForgeRegistryEntry {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public ContainerType setRegistryName(Identifier name) {
+	public IForgeRegistryEntry setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return (ContainerType) (Object) this;
+		return (IForgeRegistryEntry) this;
 	}
 
 	public Identifier getRegistryName() {