From 668b39bb2112b6da8fa91baa1bb491e4b9dcfdd0 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 14 Jul 2024 02:14:18 +1200 Subject: [PATCH] Fix leftover enums --- .../reflection/ReflectionManagerAbstract.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/shared/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManagerAbstract.java b/shared/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManagerAbstract.java index 91cf1dbd..efbffe8a 100644 --- a/shared/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManagerAbstract.java +++ b/shared/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManagerAbstract.java @@ -109,11 +109,19 @@ public interface ReflectionManagerAbstract { } default Cat.Type getCatTypeFromInt(int catType) { - return Cat.Type.values()[catType]; + if (Cat.Type.class.isEnum()) { + return Cat.Type.class.getEnumConstants()[catType]; + } + + throw new IllegalStateException("This method should have been overwritten by an extending class"); } default int getCatVariantAsInt(Cat.Type type) { - return type.ordinal(); + if (type instanceof Enum) { + return ((Enum) type).ordinal(); + } + + throw new IllegalStateException("This method should have been overwritten by an extending class"); } Art getPaintingFromInt(int paintingId); @@ -121,11 +129,19 @@ public interface ReflectionManagerAbstract { int getPaintingAsInt(Art type); default Frog.Variant getFrogVariantFromInt(int frogType) { - return Frog.Variant.values()[frogType]; + if (Frog.Variant.class.isEnum()) { + return Frog.Variant.class.getEnumConstants()[frogType]; + } + + throw new IllegalStateException("This method should have been overwritten by an extending class"); } default int getFrogVariantAsInt(Frog.Variant type) { - return type.ordinal(); + if (type instanceof Enum) { + return ((Enum) type).ordinal(); + } + + throw new IllegalStateException("This method should have been overwritten by an extending class"); } default Wolf.Variant getWolfVariantFromInt(int wolfVariant) {