Make ReflectiveConfig.Section implement ValueTreeNode.Section

src/main/java/org/quiltmc/config/api/InternalsHelper.java

@@ -17,6 +17,8 @@
 package org.quiltmc.config.api;
 
 import org.jetbrains.annotations.ApiStatus;
+import org.quiltmc.config.api.values.ValueTreeNode;
+import org.quiltmc.config.impl.builders.ReflectiveConfigCreator;
 
 /**
  * Provides the implementation packages access to package-private methods. <strong>DO NOT USE THIS CLASS</strong>
@@ -29,5 +31,14 @@ private InternalsHelper() {
 
 	public static <T extends ReflectiveConfig> void setWrappedConfig(T wrapped, Config config) {
 		wrapped.setWrappedConfig(config);
+		for (ValueTreeNode node : config.nodes()) {
+			if (node instanceof ValueTreeNode.Section) {
+				ValueTreeNode.Section section = (ValueTreeNode.Section) node;
+				ReflectiveConfigCreator.SectionMarker marker = section.metadata(ReflectiveConfigCreator.SectionMarker.TYPE);
+				if (marker != null) {
+					marker.self.setWrappedSection(section);
+				}
+			}
+		}
 	}
 }

src/main/java/org/quiltmc/config/api/ReflectiveConfig.java

@@ -18,6 +18,7 @@
 
 import org.quiltmc.config.api.metadata.MetadataType;
 import org.quiltmc.config.api.values.TrackedValue;
+import org.quiltmc.config.api.values.ValueKey;
 import org.quiltmc.config.api.values.ValueList;
 import org.quiltmc.config.api.values.ValueMap;
 import org.quiltmc.config.api.values.ValueTreeNode;
@@ -27,6 +28,7 @@
 
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -112,7 +114,9 @@ public final <T> ValueMap.TrackedBuilder<T> map(T defaultValue) {
 		return new ValueMapBuilderImpl.TrackedValueMapBuilderImpl<>(defaultValue, this::value);
 	}
 
-	public static class Section {
+	public static class Section implements ValueTreeNode.Section {
+		private ValueTreeNode.Section wrapped;
+
 		public final <T> TrackedValue<T> value(T defaultValue) {
 			ConfigUtils.assertValueType(defaultValue);
 
@@ -127,5 +131,39 @@ public final <T> TrackedValue<ValueList<T>> list(T defaultValue, T... values) {
 		public final <T> ValueMap.TrackedBuilder<T> map(T defaultValue) {
 			return new ValueMapBuilderImpl.TrackedValueMapBuilderImpl<>(defaultValue, this::value);
 		}
+
+		@Override
+		public ValueKey key() {
+			return this.wrapped.key();
+		}
+
+		@Override
+		public void propagateInheritedMetadata(Map<MetadataType<?, ?>, Object> inheritedMetadata) {
+			this.wrapped.propagateInheritedMetadata(inheritedMetadata);
+		}
+
+		@Override
+		public <M> M metadata(MetadataType<M, ?> type) {
+			return this.wrapped.metadata(type);
+		}
+
+		@Override
+		public <M> boolean hasMetadata(MetadataType<M, ?> type) {
+			return this.wrapped.hasMetadata(type);
+		}
+
+		@Override
+		public Map<MetadataType<?, ?>, Object> metadata() {
+			return this.wrapped.metadata();
+		}
+
+		@Override
+		public Iterator<ValueTreeNode> iterator() {
+			return this.wrapped.iterator();
+		}
+
+		final void setWrappedSection(ValueTreeNode.Section section) {
+			this.wrapped = section;
+		}
 	}
 }

src/main/java/org/quiltmc/config/impl/builders/ReflectiveConfigCreator.java

@@ -23,13 +23,15 @@
 import org.quiltmc.config.impl.ConfigFieldAnnotationProcessors;
 import org.quiltmc.config.api.exceptions.ConfigCreationException;
 import org.quiltmc.config.api.exceptions.ConfigFieldException;
+import org.quiltmc.config.api.metadata.MetadataType;
 import org.quiltmc.config.impl.tree.TrackedValueImpl;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.Objects;
 
 public class ReflectiveConfigCreator<C> implements Config.Creator {
 	private final Class<C> creatorClass;
@@ -39,6 +41,31 @@ public ReflectiveConfigCreator(Class<C> creatorClass) {
 		this.creatorClass = creatorClass;
 	}
 
+	public static class SectionMarker {
+		public static MetadataType<SectionMarker, Builder> TYPE = MetadataType.create(Builder::new);
+		public final ReflectiveConfig.Section self;
+
+		private SectionMarker(ReflectiveConfig.Section self) {
+			this.self = self;
+		}
+
+		// ReadWriteCycleTest needs these to be equal
+		@Override
+		public boolean equals(Object obj) {
+			return obj instanceof SectionMarker && ((SectionMarker) obj).self.getClass().equals(this.self.getClass());
+		}
+
+		public static class Builder implements MetadataType.Builder<SectionMarker> {
+			private ReflectiveConfig.Section self;
+
+			@Override
+			public ReflectiveConfigCreator.SectionMarker build() {
+				Objects.requireNonNull(this.self);
+				return new SectionMarker(this.self);
+			}
+		}
+	}
+
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	private void createField(Config.SectionBuilder builder, Object object, Field field) throws IllegalAccessException {
 		if (!Modifier.isStatic(field.getModifiers()) && !Modifier.isTransient(field.getModifiers())) {
@@ -127,6 +154,8 @@ private void createField(Config.SectionBuilder builder, Object object, Field fie
 							}
 						}
 					}
+
+					b.metadata(SectionMarker.TYPE, metaBuilder -> metaBuilder.self = (ReflectiveConfig.Section) defaultValue);
 				});
 			} else if (defaultValue == null) {
 				throw new ConfigFieldException("Default value for field '" + field.getName() + "' cannot be null");