changes from review

Author: Nuclearfarts

patchwork-enum-hacks/src/main/java/com/patchworkmc/api/enumhacks/EnumHacks.java

@@ -25,6 +25,7 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
+import java.util.function.IntFunction;
 import java.util.function.Predicate;
 
 import com.google.common.collect.ImmutableList;
@@ -134,71 +135,51 @@ private static void clearCachedValues(Class<? extends Enum<?>> clazz) {
 		}
 	}
 
-	public static Rarity createRarity(String name, Formatting formatting) {
-		Rarity[] values = Rarity.values(); //each values call creates a copy of the array. avoid them.
-		Rarity instance = RarityAccessor.invokeConstructor(name, values.length, formatting);
+	private static <T extends Enum<T>> T constructAndAdd(Class<T> clazz, IntFunction<? extends T> constructor) {
+		T[] values = clazz.getEnumConstants();
+		T instance = constructor.apply(values.length);
 		addToValues(values, instance);
-		clearCachedValues(Rarity.class);
+		clearCachedValues(clazz);
 		return instance;
 	}
 
+	public static Rarity createRarity(String name, Formatting formatting) {
+		return constructAndAdd(Rarity.class, ordinal -> RarityAccessor.invokeConstructor(name, ordinal, formatting));
+	}
+
 	public static EntityCategory createEntityCategory(String constantName, String name, int spawnCap, boolean peaceful, boolean animal) {
-		EntityCategory[] values = EntityCategory.values();
-		EntityCategory instance = EntityCategoryAccessor.invokeConstructor(constantName, values.length, name, spawnCap, peaceful, animal);
-		addToValues(values, instance);
-		clearCachedValues(EntityCategory.class);
-		return instance;
+		return constructAndAdd(EntityCategory.class, ordinal -> EntityCategoryAccessor.invokeConstructor(constantName, ordinal, name, spawnCap, peaceful, animal));
 	}
 
 	public static StructurePool.Projection createStructurePoolProjection(String name, String id, ImmutableList<StructureProcessor> processors) {
-		StructurePool.Projection[] values = StructurePool.Projection.values();
-		StructurePool.Projection instance = StructurePoolProjectionAccessor.invokeConstructor(name, values.length, id, processors);
-		addToValues(values, instance);
-		clearCachedValues(StructurePool.Projection.class);
+		StructurePool.Projection instance = constructAndAdd(StructurePool.Projection.class, ordinal -> StructurePoolProjectionAccessor.invokeConstructor(name, ordinal, id, processors));
 		StructurePoolProjectionAccessor.getIdProjectionMap().put(id, instance);
 		return instance;
 	}
 
 	public static OreFeatureConfig.Target createOreFeatureConfigTarget(String constantName, String name, Predicate<BlockState> predicate) {
-		OreFeatureConfig.Target[] values = OreFeatureConfig.Target.values();
-		OreFeatureConfig.Target instance = OreFeatureConfigTargetAccessor.invokeConstructor(constantName, values.length, name, predicate);
-		addToValues(values, instance);
-		clearCachedValues(OreFeatureConfig.Target.class);
+		OreFeatureConfig.Target instance = constructAndAdd(OreFeatureConfig.Target.class, ordinal -> OreFeatureConfigTargetAccessor.invokeConstructor(constantName, ordinal, name, predicate));
 		OreFeatureConfigTargetAccessor.getNameMap().put(name, instance);
 		return instance;
 	}
 
 	public static BannerPattern createBannerPattern(String constantName, String name, String id, ItemStack baseStack) {
-		BannerPattern[] values = BannerPattern.values();
-		BannerPattern instance = BannerPatternAccessor.invokeConstructor(constantName, values.length, name, id, baseStack);
-		addToValues(values, instance);
-		clearCachedValues(BannerPattern.class);
-		return instance;
+		return constructAndAdd(BannerPattern.class, ordinal -> BannerPatternAccessor.invokeConstructor(constantName, ordinal, name, id, baseStack));
 	}
 
 	public static BannerPattern createBannerPattern(String constantName, String name, String id, String recipePattern0, String recipePattern1, String recipePattern2) {
-		BannerPattern[] values = BannerPattern.values();
-		BannerPattern instance = BannerPatternAccessor.invokeConstructor(constantName, values.length, name, id, recipePattern0, recipePattern1, recipePattern2);
-		addToValues(values, instance);
-		clearCachedValues(BannerPattern.class);
-		return instance;
+		return constructAndAdd(BannerPattern.class, ordinal -> BannerPatternAccessor.invokeConstructor(constantName, ordinal, name, id, recipePattern0, recipePattern1, recipePattern2));
 	}
 
 	public static SpawnRestriction.Location createSpawnRestrictionLocation(String name, TriPredicate<ViewableWorld, BlockPos, EntityType<?>> predicate) {
-		SpawnRestriction.Location[] values = SpawnRestriction.Location.values();
-		SpawnRestriction.Location instance = SpawnRestrictionLocationAccessor.invokeConstructor(name, values.length);
+		SpawnRestriction.Location instance = constructAndAdd(SpawnRestriction.Location.class, ordinal -> SpawnRestrictionLocationAccessor.invokeConstructor(name, ordinal));
 		((PatchworkSpawnRestrictionLocation) (Object) instance).patchwork_setPredicate(predicate);
-		addToValues(values, instance);
-		clearCachedValues(SpawnRestriction.Location.class);
 		return instance;
 	}
 
 	public static EnchantmentTarget createEnchantmentTarget(String name, Predicate<Item> predicate) {
-		EnchantmentTarget[] values = EnchantmentTarget.values();
-		EnchantmentTarget instance = ENCHANTMENT_TARGET_FACTORY.create(name, values.length);
+		EnchantmentTarget instance = constructAndAdd(EnchantmentTarget.class, ordinal -> ENCHANTMENT_TARGET_FACTORY.create(name, ordinal));
 		((PatchworkEnchantmentTarget) instance).patchwork_setPredicate(predicate);
-		addToValues(values, instance);
-		clearCachedValues(EnchantmentTarget.class);
 		return instance;
 	}
 

patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/PatchworkSpawnRestrictionLocation.java

@@ -22,15 +22,14 @@
 import net.minecraftforge.common.util.TriPredicate;
 
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.SpawnRestriction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.ViewableWorld;
 
-public interface PatchworkSpawnRestrictionLocation extends HackableEnum<SpawnRestriction.Location> {
+public interface PatchworkSpawnRestrictionLocation {
 	boolean patchwork_useVanillaBehavior();
 
 	void patchwork_setPredicate(TriPredicate<ViewableWorld, BlockPos, EntityType<?>> predicate);
 
-	//Forge method, so no prefix
+	// Forge method, so no prefix
 	boolean canSpawnAt(ViewableWorld world, BlockPos pos, EntityType<?> type);
 }

patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/BannerPatternMixin.java

@@ -30,7 +30,10 @@
 
 @Mixin(BannerPattern.class)
 public class BannerPatternMixin implements HackableEnum<BannerPattern> {
-	private static @Shadow @Final @Mutable BannerPattern[] field_11833;
+	@Shadow
+	@Final
+	@Mutable
+	private static BannerPattern[] field_11833;
 
 	@Override
 	public void patchwork_setValues(BannerPattern[] values) {

patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/EnchantmentTargetInnerMixin.java

@@ -41,11 +41,10 @@ public class EnchantmentTargetInnerMixin implements PatchworkEnchantmentTarget {
 	@Unique
 	private Predicate<Item> predicate;
 
-	// Have to use full signature or the annotation processor complains
 	@Inject(method = "isAcceptableItem(Lnet/minecraft/item/Item;)Z", at = @At("HEAD"), cancellable = true)
-	private void checkItem(Item item, CallbackInfoReturnable<Boolean> cir) {
+	private void checkItem(Item item, CallbackInfoReturnable<Boolean> callback) {
 		if (isPatchwork) {
-			cir.setReturnValue(predicate.test(item));
+			callback.setReturnValue(predicate.test(item));
 		}
 	}
 

patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/EnchantmentTargetMixin.java

@@ -30,7 +30,10 @@
 
 @Mixin(EnchantmentTarget.class)
 public class EnchantmentTargetMixin implements HackableEnum<EnchantmentTarget> {
-	private static @Shadow @Final @Mutable EnchantmentTarget[] field_9077;
+	@Shadow
+	@Final
+	@Mutable
+	private static EnchantmentTarget[] field_9077;
 
 	@Override
 	public void patchwork_setValues(EnchantmentTarget[] values) {

patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/EntityCategoryMixin.java

@@ -30,7 +30,10 @@
 
 @Mixin(EntityCategory.class)
 public class EntityCategoryMixin implements HackableEnum<EntityCategory> {
-	private static @Shadow @Final @Mutable EntityCategory[] field_6301;
+	@Shadow
+	@Final
+	@Mutable
+	private static EntityCategory[] field_6301;
 
 	@Override
 	public void patchwork_setValues(EntityCategory[] values) {

patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/OreFeatureConfigTargetMixin.java

@@ -30,7 +30,10 @@
 
 @Mixin(OreFeatureConfig.Target.class)
 public class OreFeatureConfigTargetMixin implements HackableEnum<OreFeatureConfig.Target> {
-	private static @Shadow @Final @Mutable OreFeatureConfig.Target[] field_13729;
+	@Shadow
+	@Final
+	@Mutable
+	private static OreFeatureConfig.Target[] field_13729;
 
 	@Override
 	public void patchwork_setValues(OreFeatureConfig.Target[] values) {

patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/RarityMixin.java

@@ -30,7 +30,10 @@
 
 @Mixin(Rarity.class)
 public class RarityMixin implements HackableEnum<Rarity> {
-	private static @Shadow @Final @Mutable Rarity[] field_8905;
+	@Shadow
+	@Final
+	@Mutable
+	private static Rarity[] field_8905;
 
 	@Override
 	public void patchwork_setValues(Rarity[] values) {

patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/SpawnHelperMixin.java

@@ -34,16 +34,16 @@
 
 @Mixin(SpawnHelper.class)
 public class SpawnHelperMixin {
-	@Inject(method = "canSpawn",
+	@Inject(method = "canSpawn(Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/CollisionView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityType;)Z",
 			at = @At(value = "INVOKE", target = "net/minecraft/world/ViewableWorld.getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;"),
 			cancellable = true)
-	private static void handleCustomSpawnRestrictionLocation(SpawnRestriction.Location location, ViewableWorld viewableWorld, BlockPos blockPos, EntityType<?> entityType, CallbackInfoReturnable<Boolean> cir) {
+	private static void handleCustomSpawnRestrictionLocation(SpawnRestriction.Location location, ViewableWorld world, BlockPos pos, EntityType<?> type, CallbackInfoReturnable<Boolean> callback) {
 		PatchworkSpawnRestrictionLocation patchworkLocation = (PatchworkSpawnRestrictionLocation) (Object) location;
 
 		if (patchworkLocation.patchwork_useVanillaBehavior()) {
 			return;
 		}
 
-		cir.setReturnValue(patchworkLocation.canSpawnAt(viewableWorld, blockPos, entityType));
+		callback.setReturnValue(patchworkLocation.canSpawnAt(world, pos, type));
 	}
 }

patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/SpawnRestrictionLocationMixin.java

@@ -31,14 +31,18 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.ViewableWorld;
 
+import com.patchworkmc.impl.enumhacks.HackableEnum;
 import com.patchworkmc.impl.enumhacks.PatchworkSpawnRestrictionLocation;
 
 @Mixin(SpawnRestriction.Location.class)
-public class SpawnRestrictionLocationMixin implements PatchworkSpawnRestrictionLocation {
+public class SpawnRestrictionLocationMixin implements PatchworkSpawnRestrictionLocation, HackableEnum<SpawnRestriction.Location> {
 	@Unique
 	private TriPredicate<ViewableWorld, BlockPos, EntityType<?>> predicate;
 
-	private static @Shadow @Final @Mutable SpawnRestriction.Location[] field_6319;
+	@Shadow
+	@Final
+	@Mutable
+	private static SpawnRestriction.Location[] field_6319;
 
 	public boolean canSpawnAt(ViewableWorld world, BlockPos pos, EntityType<?> type) {
 		return predicate.test(world, pos, type);