Deduplication

florensie · florensie · commit 6362526897d7 · 2020-01-26T02:41:25.000+01:00
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinActivity.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinActivity.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Activity.class)
 public class MixinActivity implements ExtendedForgeRegistryEntry<Activity> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.ACTIVITY.getId((Activity) (Object) this);
+		Activity activity = (Activity) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.ACTIVITY, activity, registryName);
 	}
 
 	public Class<Activity> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiomeSourceType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiomeSourceType.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(BiomeSourceType.class)
 public class MixinBiomeSourceType implements ExtendedForgeRegistryEntry<BiomeSourceType> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.BIOME_SOURCE_TYPE.getId((BiomeSourceType) (Object) this);
+		BiomeSourceType<?, ?> biomeSourceType = (BiomeSourceType<?, ?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.BIOME_SOURCE_TYPE, biomeSourceType, registryName);
 	}
 
 	public Class<BiomeSourceType> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlockEntityType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlockEntityType.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(BlockEntityType.class)
 public class MixinBlockEntityType implements ExtendedForgeRegistryEntry<BlockEntityType> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.BLOCK_ENTITY.getId((BlockEntityType) (Object) this);
+		BlockEntityType<?> blockEntityType = (BlockEntityType<?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.BLOCK_ENTITY, blockEntityType, registryName);
 	}
 
 	public Class<BlockEntityType> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCarver.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCarver.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Carver.class)
 public class MixinCarver implements ExtendedForgeRegistryEntry<Carver> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.CARVER.getId((Carver) (Object) this);
+		Carver<?> carver = (Carver<?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.CARVER, carver, registryName);
 	}
 
 	public Class<Carver> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkGeneratorType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkGeneratorType.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(ChunkGeneratorType.class)
 public class MixinChunkGeneratorType implements ExtendedForgeRegistryEntry<ChunkGeneratorType> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.CHUNK_GENERATOR_TYPE.getId((ChunkGeneratorType) (Object) this);
+		ChunkGeneratorType<?, ?> chunkGeneratorType = (ChunkGeneratorType<?, ?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.CHUNK_GENERATOR_TYPE, chunkGeneratorType, registryName);
 	}
 
 	public Class<ChunkGeneratorType> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkStatus.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkStatus.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(ChunkStatus.class)
 public class MixinChunkStatus implements ExtendedForgeRegistryEntry<ChunkStatus> {
@@ -42,14 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.CHUNK_STATUS.getId((ChunkStatus) (Object) this);
-		Identifier set = registryName;
+		ChunkStatus chunkStatus = (ChunkStatus) (Object) this;
 
-		if (set == null) {
-			set = Registry.CHUNK_STATUS.getDefaultId();
-		}
-
-		return current != Registry.CHUNK_STATUS.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.CHUNK_STATUS, chunkStatus, registryName);
 	}
 
 	public Class<ChunkStatus> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinContainerType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinContainerType.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(ContainerType.class)
 public class MixinContainerType implements ExtendedForgeRegistryEntry<ContainerType> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.CONTAINER.getId((ContainerType) (Object) this);
+		ContainerType<?> containerType = (ContainerType<?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.CONTAINER, containerType, registryName);
 	}
 
 	public Class<ContainerType> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCookingRecipeSerializer.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCookingRecipeSerializer.java
@@ -29,6 +29,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(CookingRecipeSerializer.class)
 public class MixinCookingRecipeSerializer implements ExtendedForgeRegistryEntry<RecipeSerializer> {
@@ -43,9 +44,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.RECIPE_SERIALIZER.getId((CookingRecipeSerializer) (Object) this);
+		CookingRecipeSerializer<?> cookingRecipeSerializer = (CookingRecipeSerializer<?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.RECIPE_SERIALIZER, cookingRecipeSerializer, registryName);
 	}
 
 	public Class<RecipeSerializer> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCuttingRecipeSerializer.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCuttingRecipeSerializer.java
@@ -29,6 +29,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(CuttingRecipe.Serializer.class)
 public class MixinCuttingRecipeSerializer implements ExtendedForgeRegistryEntry<RecipeSerializer> {
@@ -43,9 +44,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.RECIPE_SERIALIZER.getId((CuttingRecipe.Serializer) (Object) this);
+		CuttingRecipe.Serializer<?> cuttingRecipeSerializer = (CuttingRecipe.Serializer<?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.RECIPE_SERIALIZER, cuttingRecipeSerializer, registryName);
 	}
 
 	public Class<RecipeSerializer> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinDecorator.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinDecorator.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Decorator.class)
 public class MixinDecorator implements ExtendedForgeRegistryEntry<Decorator> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.DECORATOR.getId((Decorator) (Object) this);
+		Decorator<?> decorator = (Decorator<?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.DECORATOR, decorator, registryName);
 	}
 
 	public Class<Decorator> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEnchantment.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEnchantment.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Enchantment.class)
 public class MixinEnchantment implements ExtendedForgeRegistryEntry<Enchantment> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.ENCHANTMENT.getId((Enchantment) (Object) this);
+		Enchantment enchantment = (Enchantment) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.ENCHANTMENT, enchantment, registryName);
 	}
 
 	public Class<Enchantment> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEntityType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEntityType.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(EntityType.class)
 public class MixinEntityType implements ExtendedForgeRegistryEntry<EntityType> {
@@ -42,14 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.ENTITY_TYPE.getId((EntityType) (Object) this);
-		Identifier set = registryName;
+		EntityType<?> entityType = (EntityType<?>) (Object) this;
 
-		if (set == null) {
-			set = Registry.ENTITY_TYPE.getDefaultId();
-		}
-
-		return current != Registry.ENTITY_TYPE.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.ENTITY_TYPE, entityType, registryName);
 	}
 
 	public Class<EntityType> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFluid.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFluid.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Fluid.class)
 public class MixinFluid implements ExtendedForgeRegistryEntry<Fluid> {
@@ -42,14 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.FLUID.getId((Fluid) (Object) this);
-		Identifier set = registryName;
+		Fluid fluid = (Fluid) (Object) this;
 
-		if (set == null) {
-			set = Registry.FLUID.getDefaultId();
-		}
-
-		return current != Registry.FLUID.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.FLUID, fluid, registryName);
 	}
 
 	public Class<Fluid> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinMemoryModuleType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinMemoryModuleType.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(MemoryModuleType.class)
 public class MixinMemoryModuleType implements ExtendedForgeRegistryEntry<MemoryModuleType> {
@@ -42,14 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.MEMORY_MODULE_TYPE.getId((MemoryModuleType) (Object) this);
-		Identifier set = registryName;
+		MemoryModuleType<?> memoryModuleType = (MemoryModuleType<?>) (Object) this;
 
-		if (set == null) {
-			set = Registry.MEMORY_MODULE_TYPE.getDefaultId();
-		}
-
-		return current != Registry.MEMORY_MODULE_TYPE.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.MEMORY_MODULE_TYPE, memoryModuleType, registryName);
 	}
 
 	public Class<MemoryModuleType> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPaintingMotive.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPaintingMotive.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(PaintingMotive.class)
 public class MixinPaintingMotive implements ExtendedForgeRegistryEntry<PaintingMotive> {
@@ -42,14 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.MOTIVE.getId((PaintingMotive) (Object) this);
-		Identifier set = registryName;
+		PaintingMotive paintingMotive = (PaintingMotive) (Object) this;
 
-		if (set == null) {
-			set = Registry.MOTIVE.getDefaultId();
-		}
-
-		return current != Registry.MOTIVE.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.MOTIVE, paintingMotive, registryName);
 	}
 
 	public Class<PaintingMotive> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinParticleType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinParticleType.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(ParticleType.class)
 public class MixinParticleType implements ExtendedForgeRegistryEntry<ParticleType> {
@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.PARTICLE_TYPE.getId((ParticleType) (Object) this);
+		ParticleType<?> particleType = (ParticleType<?>) (Object) this;
 
-		return current != null ? current : registryName;
+		return Identifiers.getOrFallback(Registry.PARTICLE_TYPE, particleType, registryName);
 	}
 
 	public Class<ParticleType> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPointOfInterestType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPointOfInterestType.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(PointOfInterestType.class)
 public class MixinPointOfInterestType implements ExtendedForgeRegistryEntry<PointOfInterestType> {
@@ -42,14 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.POINT_OF_INTEREST_TYPE.getId((PointOfInterestType) (Object) this);
-		Identifier set = registryName;
+		PointOfInterestType pointOfInterestType = (PointOfInterestType) (Object) this;
 
-		if (set == null) {
-			set = Registry.POINT_OF_INTEREST_TYPE.getDefaultId();
-		}
-
-		return current != Registry.POINT_OF_INTEREST_TYPE.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.POINT_OF_INTEREST_TYPE, pointOfInterestType, registryName);
 	}
 
 	public Class<PointOfInterestType> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPotion.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPotion.java
@@ -28,6 +28,7 @@
 import net.minecraft.util.registry.Registry;
 
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
+import com.patchworkmc.impl.registries.Identifiers;
 
 @Mixin(Potion.class)
 public class MixinPotion implements ExtendedForgeRegistryEntry<Potion> {
@@ -42,14 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.POTION.getId((Potion) (Object) this);
-		Identifier set = registryName;
+		Potion potion = (Potion) (Object) this;
 
-		if (set == null) {
-			set = Registry.POTION.getDefaultId();
-		}
-
-		return current != Registry.POTION.getDefaultId() ? current : set;
+		return Identifiers.getOrFallback(Registry.POTION, potion, registryName);
 	}
 
 	public Class<Potion> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSchedule.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSchedule.java
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSensorType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSensorType.java
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinShapedRecipeSerializer.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinShapedRecipeSerializer.java
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinShapelessRecipeSerializer.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinShapelessRecipeSerializer.java
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSoundEvent.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSoundEvent.java
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSpecialRecipeSerializer.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSpecialRecipeSerializer.java
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatType.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatType.java
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatusEffect.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatusEffect.java
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinVillagerProfession.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinVillagerProfession.java

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`import net.minecraft.util.registry.Registry;`
`29`	`29`
`30`	`30`	`import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;`
	`31`	`+import com.patchworkmc.impl.registries.Identifiers;`
`31`	`32`
`32`	`33`	`@Mixin(Activity.class)`
`33`	`34`	`public class MixinActivity implements ExtendedForgeRegistryEntry<Activity> {`
`@@ -42,9 +43,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`public Identifier getRegistryName() {`
`45`		`- Identifier current = Registry.ACTIVITY.getId((Activity) (Object) this);`
	`46`	`+ Activity activity = (Activity) (Object) this;`
`46`	`47`
`47`		`- return current != null ? current : registryName;`
	`48`	`+ return Identifiers.getOrFallback(Registry.ACTIVITY, activity, registryName);`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`public Class<Activity> getRegistryType() {`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import net.minecraft.util.registry.Registry;`
`30`	`30`
`31`	`31`	`import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;`
	`32`	`+import com.patchworkmc.impl.registries.Identifiers;`
`32`	`33`
`33`	`34`	`@Mixin(CookingRecipeSerializer.class)`
`34`	`35`	`public class MixinCookingRecipeSerializer implements ExtendedForgeRegistryEntry<RecipeSerializer> {`
`@@ -43,9 +44,9 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`public Identifier getRegistryName() {`
`46`		`- Identifier current = Registry.RECIPE_SERIALIZER.getId((CookingRecipeSerializer) (Object) this);`
	`47`	`+ CookingRecipeSerializer<?> cookingRecipeSerializer = (CookingRecipeSerializer<?>) (Object) this;`
`47`	`48`
`48`		`- return current != null ? current : registryName;`
	`49`	`+ return Identifiers.getOrFallback(Registry.RECIPE_SERIALIZER, cookingRecipeSerializer, registryName);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`public Class<RecipeSerializer> getRegistryType() {`