fix external compat not adding fields as properties & search in superclasses

Author: brachy84

src/main/java/com/cleanroommc/groovyscript/compat/mods/ExternalModContainer.java

@@ -1,13 +1,15 @@
 package com.cleanroommc.groovyscript.compat.mods;
 
 import com.cleanroommc.groovyscript.api.GroovyPlugin;
+import com.google.common.base.Suppliers;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Supplier;
 
 /**
  * This is used for external mod compat. Don't use this directly. Instead, implement {@link GroovyPlugin} on any class.
@@ -16,15 +18,19 @@
 public class ExternalModContainer extends GroovyContainer<GroovyPropertyContainer> {
 
     private final GroovyPlugin groovyContainer;
-    private final GroovyPropertyContainer container;
+    private final Supplier<GroovyPropertyContainer> container;
     private final String modId;
     private final String containerName;
     private final Collection<String> aliases;
     private final Priority priority;
 
     ExternalModContainer(@NotNull GroovyPlugin groovyContainer, @NotNull GroovyPropertyContainer container) {
         this.groovyContainer = Objects.requireNonNull(groovyContainer);
-        this.container = Objects.requireNonNull(container);
+        Objects.requireNonNull(container);
+        this.container = Suppliers.memoize(() -> {
+            container.addPropertyFieldsOf(container, false);
+            return container;
+        });
         this.modId = groovyContainer.getModId();
         this.containerName = groovyContainer.getContainerName();
         Set<String> aliasSet = new ObjectOpenHashSet<>(groovyContainer.getAliases());
@@ -60,7 +66,7 @@ public void onCompatLoaded(GroovyContainer<?> container) {
 
     @Override
     public GroovyPropertyContainer get() {
-        return container;
+        return container.get();
     }
 
     @Override

src/main/java/com/cleanroommc/groovyscript/compat/mods/GroovyPropertyContainer.java

@@ -7,6 +7,8 @@
 import com.cleanroommc.groovyscript.sandbox.expand.ExpansionHelper;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnmodifiableView;
 
 import java.lang.reflect.Field;
@@ -47,28 +49,52 @@ protected void addProperty(INamed property) {
     @ApiStatus.OverrideOnly
     public void initialize(GroovyContainer<?> owner) {}
 
-    protected void addPropertyFieldsOf(Object object, boolean privateToo) {
+    protected void addPropertyFieldsOf(@NotNull Object object, boolean privateToo) {
+        addPropertyFieldsOf(object, null, privateToo);
+    }
+
+    /**
+     * Searches all fields in an object and adds them with their aliases as a groovy bean property.
+     * This method is automatically called for every external and internal compat with the property container as its first argument.
+     *
+     * @param object          the object to search fields in. If this is a class only static fields are allowed.
+     * @param untilSuperclass this determines how deep the class hierarchy should be searched (this class excluded). If this i null it will search up to
+     *                        {@link GroovyPropertyContainer}.class if the object to search in is a subclass of {@link GroovyPropertyContainer} or
+     *                        {@link Object}.class else.
+     * @param privateToo      true if non-public fields should be included too
+     */
+    protected void addPropertyFieldsOf(@NotNull Object object, @Nullable Class<?> untilSuperclass, boolean privateToo) {
         boolean staticOnly = false;
         Class<?> clazz;
-        if (object instanceof Class<?>c) {
+        if (object instanceof Class<?> c) {
             clazz = c;
             staticOnly = true;
         } else {
             clazz = object.getClass();
         }
-        for (Field field : clazz.getDeclaredFields()) {
-            boolean isStatic = Modifier.isStatic(field.getModifiers());
-            if (!field.isAnnotationPresent(GroovyBlacklist.class) && INamed.class.isAssignableFrom(field.getType()) && (!staticOnly || isStatic) && (privateToo || (Modifier.isPublic(field.getModifiers())))) {
-                try {
-                    if (!field.isAccessible()) field.setAccessible(true);
-                    Object o = field.get(isStatic ? null : object);
-                    if (o != null) {
-                        addProperty((INamed) o);
+        if (untilSuperclass == null) {
+            if (GroovyPropertyContainer.class.isAssignableFrom(clazz)) {
+                untilSuperclass = GroovyPropertyContainer.class;
+            } else {
+                untilSuperclass = Object.class;
+            }
+        }
+        while (clazz != null && clazz != untilSuperclass) {
+            for (Field field : clazz.getDeclaredFields()) {
+                boolean isStatic = Modifier.isStatic(field.getModifiers());
+                if (!field.isAnnotationPresent(GroovyBlacklist.class) && INamed.class.isAssignableFrom(field.getType()) && (!staticOnly || isStatic) && (privateToo || (Modifier.isPublic(field.getModifiers())))) {
+                    try {
+                        if (!field.isAccessible()) field.setAccessible(true);
+                        Object o = field.get(isStatic ? null : object);
+                        if (o != null) {
+                            addProperty((INamed) o);
+                        }
+                    } catch (IllegalAccessException e) {
+                        GroovyLog.get().errorMC("Failed to register {} as named property", field.getName());
                     }
-                } catch (IllegalAccessException e) {
-                    GroovyLog.get().errorMC("Failed to register {} as named property", field.getName());
                 }
             }
+            clazz = clazz.getSuperclass();
         }
     }
 }