getRegistryName code deduplication and (hopefully) dummy proofing

Author: coderbot16

patchwork-registries/src/main/java/com/patchworkmc/impl/registries/Identifiers.java

@@ -0,0 +1,56 @@
+package com.patchworkmc.impl.registries;
+
+import javax.annotation.Nullable;
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.DefaultedRegistry;
+import net.minecraft.util.registry.Registry;
+
+@ParametersAreNonnullByDefault
+public class Identifiers {
+	private Identifiers() {
+	}
+
+	/**
+	 * Gets the current {@link Identifier} for the object in the registry if it exists. If the object does not exist in
+	 * the provided registry, {@code fallback} will be returned instead.
+	 *
+	 * @param registry the registry to query. Must NOT be an instance of {@link DefaultedRegistry}, or else this method
+	 *                 will throw an {@link IllegalArgumentException}.
+	 * @return an {@link Identifier} if the instance is registered or if the fallback is non null, otherwise null
+	 */
+	@Nullable
+	public static <T> Identifier getOrFallback(Registry<T> registry, T instance, @Nullable Identifier fallback) {
+		if (registry instanceof DefaultedRegistry) {
+			// While we could just cast here, I want to catch these cases where they come up and fix them in the mixin.
+			throw new IllegalArgumentException("Used the non-defaulted getOrFallback method with a DefaultedRegistry");
+		}
+
+		Identifier current = registry.getId(instance);
+
+		if (current == null) {
+			return fallback;
+		} else {
+			return current;
+		}
+	}
+
+	/**
+	 * Gets the current {@link Identifier} for the object in the registry if it exists. If the object does not exist in
+	 * the provided registry, {@code fallback} will be returned instead.
+	 *
+	 * @param registry the registry to query. Must be an instance of {@link DefaultedRegistry}.
+	 * @return an {@link Identifier} if the instance is registered or if the fallback is non null, otherwise null
+	 */
+	@Nullable
+	public static <T> Identifier getOrFallback(DefaultedRegistry<T> registry, T instance, @Nullable Identifier fallback) {
+		Identifier current = registry.getId(instance);
+
+		if (current.equals(registry.getDefaultId())) {
+			return fallback;
+		} else {
+			return current;
+		}
+	}
+}

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

@@ -28,6 +28,7 @@
 import net.minecraft.world.biome.Biome;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Biome.class)
 public class MixinBiome implements ExtendedForgeRegistryEntry<Biome> {
@@ -42,10 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.BIOME.getId((Biome) (Object) this);
-		Identifier set = registryName;
+		Biome biome = (Biome) (Object) this;
 
-		return current != null ? current : set;
+		return Identifiers.getOrFallback(Registry.BIOME, biome, registryName);
 	}
 
 	public Class<Biome> getRegistryType() {

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

@@ -28,28 +28,24 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Block.class)
 public class MixinBlock implements ExtendedForgeRegistryEntry<Block> {
 	@Unique
 	private Identifier registryName;
 
 	@Override
-	public IForgeRegistryEntry setRegistryName(Identifier name) {
+	public IForgeRegistryEntry<Block> setRegistryName(Identifier name) {
 		this.registryName = name;
 
 		return this;
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.BLOCK.getId((Block) (Object) this);
-		Identifier set = registryName;
+		Block block = (Block) (Object) this;
 
-		if (set == null) {
-			set = Registry.BLOCK.getDefaultId();
-		}
-
-		return current != Registry.BLOCK.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.BLOCK, block, registryName);
 	}
 
 	public Class<Block> getRegistryType() {

patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFeature.java

@@ -28,6 +28,7 @@
 import net.minecraft.world.gen.feature.Feature;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Feature.class)
 public class MixinFeature implements ExtendedForgeRegistryEntry<Feature> {
@@ -42,10 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.FEATURE.getId((Feature) (Object) this);
-		Identifier set = registryName;
+		Feature<?> feature = (Feature<?>) (Object) this;
 
-		return current != null ? current : set;
+		return Identifiers.getOrFallback(Registry.FEATURE, feature, registryName);
 	}
 
 	public Class<Feature> getRegistryType() {

patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinItem.java

@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Item.class)
 public class MixinItem implements ExtendedForgeRegistryEntry<Item> {
@@ -42,14 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.ITEM.getId((Item) (Object) this);
-		Identifier set = registryName;
+		Item item = (Item) (Object) this;
 
-		if (set == null) {
-			set = Registry.ITEM.getDefaultId();
-		}
-
-		return current != Registry.ITEM.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.ITEM, item, registryName);
 	}
 
 	public Class<Item> getRegistryType() {

patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSurfaceBuilder.java

@@ -28,6 +28,7 @@
 import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(SurfaceBuilder.class)
 public class MixinSurfaceBuilder implements ExtendedForgeRegistryEntry<SurfaceBuilder> {
@@ -42,10 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.SURFACE_BUILDER.getId((SurfaceBuilder) (Object) this);
-		Identifier set = registryName;
+		SurfaceBuilder<?> surfaceBuilder = (SurfaceBuilder<?>) (Object) this;
 
-		return current != null ? current : set;
+		return Identifiers.getOrFallback(Registry.SURFACE_BUILDER, surfaceBuilder, registryName);
 	}
 
 	public Class<SurfaceBuilder> getRegistryType() {