Fix sloppy copy pasting

florensie · florensie · commit e410be235bd4 · 2020-01-25T17:00:36.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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.ACTIVITY.getId((Activity) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<Activity> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiome.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiome.java
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.BIOME.getId((Biome) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<Biome> 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.BIOME_SOURCE_TYPE.getId((BiomeSourceType) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.BLOCK_ENTITY.getId((BlockEntityType) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.CARVER.getId((Carver) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.CHUNK_GENERATOR_TYPE.getId((ChunkGeneratorType) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<ChunkGeneratorType> 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.CONTAINER.getId((ContainerType) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : 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
@@ -44,9 +44,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.RECIPE_SERIALIZER.getId((CookingRecipeSerializer) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : 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
@@ -44,9 +44,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.RECIPE_SERIALIZER.getId((CuttingRecipe.Serializer) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.DECORATOR.getId((Decorator) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.ENCHANTMENT.getId((Enchantment) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<Enchantment> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFeature.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFeature.java
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.FEATURE.getId((Feature) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<Feature> 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.PARTICLE_TYPE.getId((ParticleType) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<ParticleType> 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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.SCHEDULE.getId((Schedule) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<Schedule> getRegistryType() {
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
@@ -44,9 +44,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.RECIPE_SERIALIZER.getId((ShapedRecipe.Serializer) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<RecipeSerializer> getRegistryType() {
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
@@ -44,9 +44,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.RECIPE_SERIALIZER.getId((ShapelessRecipe.Serializer) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<RecipeSerializer> getRegistryType() {
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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.SOUND_EVENT.getId((SoundEvent) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<SoundEvent> getRegistryType() {
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
@@ -44,9 +44,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.RECIPE_SERIALIZER.getId((SpecialRecipeSerializer) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<RecipeSerializer> getRegistryType() {
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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.STAT_TYPE.getId((StatType) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<StatType> getRegistryType() {
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
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.STATUS_EFFECT.getId((StatusEffect) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<StatusEffect> getRegistryType() {
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSurfaceBuilder.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSurfaceBuilder.java
@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 
 	public Identifier getRegistryName() {
 		Identifier current = Registry.SURFACE_BUILDER.getId((SurfaceBuilder) (Object) this);
-		Identifier set = registryName;
 
-		return current != null ? current : set;
+		return current != null ? current : registryName;
 	}
 
 	public Class<SurfaceBuilder> getRegistryType() {

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {`
`43`	`43`
`44`	`44`	`public Identifier getRegistryName() {`
`45`	`45`	`Identifier current = Registry.ACTIVITY.getId((Activity) (Object) this);`
`46`		`- Identifier set = registryName;`
`47`	`46`
`48`		`- return current != null ? current : set;`
	`47`	`+ return current != null ? current : registryName;`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`public Class<Activity> getRegistryType() {`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,8 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {`
`44`	`44`
`45`	`45`	`public Identifier getRegistryName() {`
`46`	`46`	`Identifier current = Registry.RECIPE_SERIALIZER.getId((CookingRecipeSerializer) (Object) this);`
`47`		`- Identifier set = registryName;`
`48`	`47`
`49`		`- return current != null ? current : set;`
	`48`	`+ return current != null ? current : registryName;`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`public Class<RecipeSerializer> getRegistryType() {`