Change IForgeRegistryEntry.setRegistryName to return V, not IForgeRegistryEntry (#131)

* Change IForgeRegistryEntry.setRegistryName to return V, not IForgeRegistryEntry

* ExtendedForgeRegistryEntry

* Appease checkstyle

Author: cittyinthecloud

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

@@ -25,20 +25,20 @@ public abstract class ForgeRegistryEntry<V> implements IForgeRegistryEntry<V> {
 	private Identifier registryName;
 
 	@Override
-	public final IForgeRegistryEntry setRegistryName(Identifier name) {
+	public final V setRegistryName(Identifier name) {
 		return setRegistryName(name.toString());
 	}
 
-	public final IForgeRegistryEntry setRegistryName(String name) {
+	public final V setRegistryName(String name) {
 		if (getRegistryName() != null) {
 			throw new IllegalStateException("Attempted to set registry name with existing registry name! New: " + name + " Old: " + getRegistryName());
 		}
 
 		this.registryName = GameData.checkPrefix(name, true);
-		return this;
+		return (V) this;
 	}
 
-	public final IForgeRegistryEntry setRegistryName(String modID, String name) {
+	public final V setRegistryName(String modID, String name) {
 		return setRegistryName(modID + ":" + name);
 	}
 

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

@@ -39,7 +39,7 @@ public interface IForgeRegistryEntry<V> {
 	 * @param name the unique {@link Identifier}
 	 * @return this instance, to allow for chaining
 	 */
-	IForgeRegistryEntry setRegistryName(Identifier name);
+	V setRegistryName(Identifier name);
 
 	/**
 	 * Determines the type for this entry, used to look up the correct registry in the global registries list as there can only be one

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

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

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

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

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

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

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

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

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

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

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

@@ -19,7 +19,6 @@
 
 package net.patchworkmc.mixin.registries;
 
-import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
@@ -36,14 +35,14 @@ public class MixinBlockEntityType implements ExtendedForgeRegistryEntry<BlockEnt
 	private Identifier registryName;
 
 	@Override
-	public IForgeRegistryEntry<BlockEntityType> setRegistryName(Identifier name) {
+	public BlockEntityType setRegistryName(Identifier name) {
 		this.registryName = name;
 
-		return this;
+		return (BlockEntityType) (Object) this;
 	}
 
 	public Identifier getRegistryName() {
-		BlockEntityType<?> blockEntityType = (BlockEntityType<?>) (Object) this;
+		BlockEntityType<?> blockEntityType = (BlockEntityType) (Object) this;
 
 		return Identifiers.getOrFallback(Registry.BLOCK_ENTITY, blockEntityType, registryName);
 	}

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

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

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

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