fix accordion issue with field types and fix field-type buttons

Author: nextdayy

gradle.properties

@@ -12,4 +12,4 @@ dgt.java.version=8
 # Project Configuration
 project.group=org.polyfrost.oneconfig
 project.name=OneConfig
-project.version=1.0.0-alpha.69+dgt
+project.version=1.0.0-alpha.70

modules/config-impl/src/main/java/org/polyfrost/oneconfig/api/config/v1/collect/impl/OneConfigCollector.java

@@ -84,7 +84,7 @@ protected void handleField(@NotNull Field f, @NotNull Object src, @NotNull Tree
                 Tree t = Tree.tree(f.getName());
                 t.addMetadata(MHUtils.getAnnotationValues(a).getOrThrow());
                 try {
-                    handle(t, f.get(src), 1);
+                    handle(t, MHUtils.instantiate(f.getType(), true).getOrThrow(), 1);
                 } catch (Throwable e) {
                     throw new RuntimeException("Failed to collect accordion-type field " + f.getName(), e);
                 }
@@ -94,7 +94,14 @@ protected void handleField(@NotNull Field f, @NotNull Object src, @NotNull Tree
             if (opt == null) continue;
             try {
                 Property<?> p;
-                if (type == Button.class) p = Properties.dummy();
+                if (type == Button.class) {
+                    p = Properties.dummy();
+                    try {
+                        p.addMetadata("runnable", (Runnable) MHUtils.setAccessible(f).get(src));
+                    } catch (Throwable e) {
+                        throw new RuntimeException("Couldn't extract button method from field " + f.getName() + ", is it of type Runnable?", e);
+                    }
+                }
                 else p = Properties.field(null, null, f, src);
                 handleMetadata(tree, p, a, opt, f);
                 tree.put(p);

modules/config-impl/src/main/java/org/polyfrost/oneconfig/api/config/v1/collect/impl/ReflectiveCollector.java

@@ -60,6 +60,14 @@ public ReflectiveCollector(int maxDepth) {
 
 
     public void handle(@NotNull Tree tree, @NotNull Object src, int depth) {
+        if (src == null) {
+            LOGGER.error("Failed to collect properties for {} from object {} as the object was null", tree.getID(), src);
+            return;
+        }
+        if (tree == null) {
+            LOGGER.error("Failed to collect properties for {} from object {} as the tree was null", tree.getID(), src);
+            return;
+        }
         Class<?> cls = src.getClass();
         for (Field f : cls.getDeclaredFields()) {
             handleField(f, src, tree);

modules/config-impl/src/main/kotlin/org/polyfrost/oneconfig/api/config/v1/Visualizer.kt

@@ -49,7 +49,8 @@ fun interface Visualizer {
     class ButtonVisualizer : Visualizer {
         override fun visualize(prop: Property<*>): Drawable {
             val text = prop.getMetadata<String>("text")?.strv()
-            val action = prop.getMetadata<Runnable>("runnable") ?: prop.getAs()
+            val action: Runnable? = prop.getMetadata<Runnable>("runnable") ?: prop.getAs<Runnable?>()
+            require(action != null) { "Button property $prop is missing a runnable, set it with either the metadata key 'runnable' or the property value" }
             return Button(
                 size = Vec2(300f, 32f),
                 text = text ?: "oneconfig.button.default",