Fix enum field name

ArclightPowered · Jun 26, 2024 · d074a66 · d074a66
1 parent 5936027
commit d074a66
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'io.izzel.arclight'
-version '1.7.2'
+version '1.7.3'
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/io/izzel/arclight/api/EnumHelper.java b/src/main/java/io/izzel/arclight/api/EnumHelper.java
@@ -13,7 +13,7 @@ public class EnumHelper {
     public static <T> T addEnum(Class<T> cl, String name, List<Class<?>> ctorTypes, List<Object> ctorParams) {
         try {
             Unsafe.ensureClassInitialized(cl);
-            Field field = cl.getDeclaredField("ENUM$VALUES");
+            Field field = enumValuesField(cl);
             Object base = Unsafe.staticFieldBase(field);
             long offset = Unsafe.staticFieldOffset(field);
             T[] arr = (T[]) Unsafe.getObject(base, offset);
@@ -32,10 +32,25 @@ public static <T> T addEnum(Class<T> cl, String name, List<Class<?>> ctorTypes,
         }
     }
 
+    private static <T> Field enumValuesField(Class<T> cl) throws NoSuchFieldException {
+        Field field;
+        try {
+            field = cl.getDeclaredField("$VALUES");
+        } catch (NoSuchFieldException e) {
+            field = cl.getDeclaredField("ENUM$VALUES");
+        }
+        return field;
+    }
+
     @SuppressWarnings("unchecked")
     public static <T> void addEnums(Class<T> cl, List<T> list) {
         try {
-            Field field = cl.getDeclaredField("ENUM$VALUES");
+            Field field;
+            try {
+                field = cl.getDeclaredField("$VALUES");
+            } catch (NoSuchFieldException e) {
+                field = cl.getDeclaredField("ENUM$VALUES");
+            }
             Object base = Unsafe.staticFieldBase(field);
             long offset = Unsafe.staticFieldOffset(field);
             T[] arr = (T[]) Unsafe.getObject(base, offset);