Rename ConfigEntryContainer to ConfigContainer

src/main/java/me/lortseam/completeconfig/api/ConfigEntryContainer.java → src/main/java/me/lortseam/completeconfig/api/ConfigContainer.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * A container of config entries.
  */
-public interface ConfigEntryContainer {
+public interface ConfigContainer {
 
     /**
      * Specifies whether this class is a POJO. If true, every field inside this class will be considered to be a config
@@ -24,15 +24,15 @@ public interface ConfigEntryContainer {
         return false;
     }
 
-    default List<Class<? extends ConfigEntryContainer>> getConfigClasses() {
-        List<Class<? extends ConfigEntryContainer>> classes = new ArrayList<>();
-        Class<? extends ConfigEntryContainer> clazz = getClass();
+    default List<Class<? extends ConfigContainer>> getConfigClasses() {
+        List<Class<? extends ConfigContainer>> classes = new ArrayList<>();
+        Class<? extends ConfigContainer> clazz = getClass();
         while (clazz != null) {
             classes.add(clazz);
-            if (!ConfigEntryContainer.class.isAssignableFrom(clazz.getSuperclass())) {
+            if (!ConfigContainer.class.isAssignableFrom(clazz.getSuperclass())) {
                 break;
             }
-            clazz = (Class<? extends ConfigEntryContainer>) clazz.getSuperclass();
+            clazz = (Class<? extends ConfigContainer>) clazz.getSuperclass();
         }
         return ImmutableList.copyOf(classes);
     }
@@ -43,16 +43,16 @@ public interface ConfigEntryContainer {
      * @return an array of other containers
      * @see Transitive
      */
-    default ConfigEntryContainer[] getTransitiveContainers() {
-        return new ConfigEntryContainer[0];
+    default ConfigContainer[] getTransitiveContainers() {
+        return new ConfigContainer[0];
     }
 
     /**
-     * Applied to declare that a field of type {@link ConfigEntryContainer} is transitive. The container will then be
+     * Applied to declare that a field of type {@link ConfigContainer} is transitive. The container will then be
      * registered at the same level as this container.
      *
      * <p>This annotation is only required inside non-POJO classes. POJO classes will always register every field of
-     * type {@link ConfigEntryContainer}.
+     * type {@link ConfigContainer}.
      *
      * @see #getTransitiveContainers()
      */
@@ -63,7 +63,7 @@ public interface ConfigEntryContainer {
     }
 
     /**
-     * Can be applied to a field inside a POJO {@link ConfigEntryContainer} class to declare that that field should not
+     * Can be applied to a field inside a POJO {@link ConfigContainer} class to declare that that field should not
      * be considered to be a config entry.
      */
     @Target(ElementType.FIELD)

src/main/java/me/lortseam/completeconfig/api/ConfigEntry.java

@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
 
 /**
  * Applied to declare that a field is an entry inside the mod's config. Only required if
- * the {@link ConfigEntryContainer} is not a POJO class.
+ * the {@link ConfigContainer} is not a POJO class.
  *
  * <p>This annotation also contains various options to modify the entry.
  */

src/main/java/me/lortseam/completeconfig/api/ConfigEntryListener.java

@@ -28,6 +28,6 @@ public @interface ConfigEntryListener {
      *
      * @return the entry's parent class
      */
-    Class<? extends ConfigEntryContainer> container() default ConfigEntryContainer.class;
+    Class<? extends ConfigContainer> container() default ConfigContainer.class;
 
 }

src/main/java/me/lortseam/completeconfig/api/ConfigGroup.java

@@ -5,7 +5,7 @@ import com.google.common.base.CaseFormat;
 /**
  * A group of config entries. Inside its parent node, every group is uniquely defined by an identifier.
  */
-public interface ConfigGroup extends ConfigEntryContainer {
+public interface ConfigGroup extends ConfigContainer {
 
     /**
      * Used to identify this group. Defaults to the class name.

src/main/java/me/lortseam/completeconfig/data/Collection.java

@@ -1,7 +1,7 @@
 package me.lortseam.completeconfig.data;
 
 import lombok.extern.log4j.Log4j2;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.api.ConfigGroup;
 import me.lortseam.completeconfig.data.structure.FlatDataPart;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
@@ -39,16 +39,16 @@ public class Collection implements FlatDataPart<ConfigMap> {
         return Collections.unmodifiableCollection(collections.values());
     }
 
-    void resolve(ConfigEntryContainer container) {
+    void resolve(ConfigContainer container) {
         entries.resolve(container);
-        List<ConfigEntryContainer> containers = new ArrayList<>();
-        for (Class<? extends ConfigEntryContainer> clazz : container.getConfigClasses()) {
+        List<ConfigContainer> containers = new ArrayList<>();
+        for (Class<? extends ConfigContainer> clazz : container.getConfigClasses()) {
             containers.addAll(Arrays.stream(clazz.getDeclaredFields()).filter(field -> {
                 if (container.isConfigPOJO()) {
-                    return ConfigEntryContainer.class.isAssignableFrom(field.getType());
+                    return ConfigContainer.class.isAssignableFrom(field.getType());
                 }
-                if (field.isAnnotationPresent(ConfigEntryContainer.Transitive.class)) {
-                    if (!ConfigEntryContainer.class.isAssignableFrom(field.getType())) {
+                if (field.isAnnotationPresent(ConfigContainer.Transitive.class)) {
+                    if (!ConfigContainer.class.isAssignableFrom(field.getType())) {
                         throw new IllegalAnnotationTargetException("Transitive entry " + field + " must implement ConfigEntryContainer");
                     }
                     return true;
@@ -59,17 +59,17 @@ public class Collection implements FlatDataPart<ConfigMap> {
                     field.setAccessible(true);
                 }
                 try {
-                    return (ConfigEntryContainer) field.get(container);
+                    return (ConfigContainer) field.get(container);
                 } catch (IllegalAccessException e) {
                     throw new RuntimeException(e);
                 }
             }).collect(Collectors.toList()));
             if (container.isConfigPOJO()) {
                 resolve(Arrays.stream(clazz.getDeclaredClasses()).filter(nestedClass -> {
-                    return ConfigEntryContainer.class.isAssignableFrom(nestedClass) && Modifier.isStatic(nestedClass.getModifiers());
+                    return ConfigContainer.class.isAssignableFrom(nestedClass) && Modifier.isStatic(nestedClass.getModifiers());
                 }).map(nestedClass -> {
                     try {
-                        Constructor<? extends ConfigEntryContainer> constructor = (Constructor<? extends ConfigEntryContainer>) nestedClass.getDeclaredConstructor();
+                        Constructor<? extends ConfigContainer> constructor = (Constructor<? extends ConfigContainer>) nestedClass.getDeclaredConstructor();
                         if (!constructor.isAccessible()) {
                             constructor.setAccessible(true);
                         }
@@ -84,8 +84,8 @@ public class Collection implements FlatDataPart<ConfigMap> {
         resolve(containers);
     }
 
-    protected void resolve(java.util.Collection<ConfigEntryContainer> containers) {
-        for (ConfigEntryContainer c : containers) {
+    protected void resolve(java.util.Collection<ConfigContainer> containers) {
+        for (ConfigContainer c : containers) {
             if (c instanceof ConfigGroup) {
                 collections.resolve((ConfigGroup) c);
             } else {

src/main/java/me/lortseam/completeconfig/data/Config.java

@@ -2,7 +2,7 @@ package me.lortseam.completeconfig.data;
 
 import lombok.NonNull;
 import lombok.extern.log4j.Log4j2;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 import me.lortseam.completeconfig.io.ConfigSource;
 import net.fabricmc.loader.api.FabricLoader;
@@ -36,7 +36,7 @@ public class Config extends Collection {
 
     private final ConfigSource source;
 
-    private Config(ConfigSource source, LinkedHashSet<ConfigEntryContainer> children) {
+    private Config(ConfigSource source, LinkedHashSet<ConfigContainer> children) {
         super(new TranslationIdentifier(source.getModID()));
         this.source = source;
         resolve(children);
@@ -65,7 +65,7 @@ public class Config extends Collection {
 
         private final String modID;
         private String[] branch = new String[0];
-        private final LinkedHashSet<ConfigEntryContainer> children = new LinkedHashSet<>();
+        private final LinkedHashSet<ConfigContainer> children = new LinkedHashSet<>();
 
         private Builder(String modID) {
             this.modID = modID;
@@ -92,9 +92,9 @@ public class Config extends Collection {
          * @param containers one or more entry containers
          * @return this builder
          */
-        public Builder add(@NonNull ConfigEntryContainer... containers) {
+        public Builder add(@NonNull ConfigContainer... containers) {
             Arrays.stream(containers).forEach(Objects::requireNonNull);
-            for (ConfigEntryContainer container : containers) {
+            for (ConfigContainer container : containers) {
                 if (!children.add(container)) {
                     throw new IllegalArgumentException("Duplicate container");
                 }

src/main/java/me/lortseam/completeconfig/data/Entry.java

@@ -7,7 +7,7 @@ import lombok.*;
 import lombok.extern.log4j.Log4j2;
 import me.lortseam.completeconfig.CompleteConfig;
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.data.entry.EntryOrigin;
 import me.lortseam.completeconfig.data.entry.Transformation;
 import me.lortseam.completeconfig.data.structure.DataPart;
@@ -59,7 +59,7 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
         });
     }
 
-    static EntryBase<?> of(String fieldName, Class<? extends ConfigEntryContainer> parentClass) {
+    static EntryBase<?> of(String fieldName, Class<? extends ConfigContainer> parentClass) {
         try {
             return of(parentClass.getDeclaredField(fieldName), parentClass);
         } catch (NoSuchFieldException e) {
@@ -67,11 +67,11 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
         }
     }
 
-    static EntryBase<?> of(Field field, Class<? extends ConfigEntryContainer> parentClass) {
+    static EntryBase<?> of(Field field, Class<? extends ConfigContainer> parentClass) {
         return entries.computeIfAbsent(new Key(field, parentClass), absentField -> new Draft<>(field));
     }
 
-    private final ConfigEntryContainer parentObject;
+    private final ConfigContainer parentObject;
     private String customID;
     @Getter
     private final T defaultValue;
@@ -146,7 +146,7 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
         }
     }
 
-    void addListener(Method method, ConfigEntryContainer parentObject) {
+    void addListener(Method method, ConfigContainer parentObject) {
         listeners.add(new Listener<>(method, parentObject));
     }
 
@@ -242,13 +242,13 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
     private static class Key {
 
         private final Field field;
-        private final Class<? extends ConfigEntryContainer> parentClass;
+        private final Class<? extends ConfigContainer> parentClass;
 
     }
 
     static class Draft<T> extends EntryBase<T> {
 
-        static <T> Draft<T> of(Field field, Class<? extends ConfigEntryContainer> parentClass) {
+        static <T> Draft<T> of(Field field, Class<? extends ConfigContainer> parentClass) {
             EntryBase<T> accessor = (EntryBase<T>) Entry.of(field, parentClass);
             if (!(accessor instanceof Draft)) {
                 throw new UnsupportedOperationException("Entry draft of field " + field + " was already built");
@@ -267,7 +267,7 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
             interactions.add(interaction);
         }
 
-        Entry<T> build(ConfigEntryContainer parentObject, TranslationIdentifier parentTranslation) {
+        Entry<T> build(ConfigContainer parentObject, TranslationIdentifier parentTranslation) {
             Entry<T> entry = transformations.stream().filter(transformation -> transformation.test(this)).findFirst().orElse(Transformation.of(base -> true, Entry::new)).transform(this, parentObject, parentTranslation);
             for (Consumer<Entry<T>> interaction : interactions) {
                 interaction.accept(entry);

src/main/java/me/lortseam/completeconfig/data/EntryMap.java

@@ -2,7 +2,7 @@ package me.lortseam.completeconfig.data;
 
 import com.google.common.base.CaseFormat;
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.api.ConfigEntryListener;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 import me.lortseam.completeconfig.exception.IllegalAnnotationParameterException;
@@ -22,16 +22,16 @@ public class EntryMap extends ConfigMap<Entry> {
         super(translation);
     }
 
-    void resolve(ConfigEntryContainer container) {
+    void resolve(ConfigContainer container) {
         List<Entry> containerEntries = new ArrayList<>();
-        for (Class<? extends ConfigEntryContainer> clazz : container.getConfigClasses()) {
+        for (Class<? extends ConfigContainer> clazz : container.getConfigClasses()) {
             List<Entry> clazzEntries = new ArrayList<>();
             Arrays.stream(clazz.getDeclaredFields()).filter(field -> {
                 if (clazz != container.getClass() && Modifier.isStatic(field.getModifiers())) {
                     return false;
                 }
                 if (container.isConfigPOJO()) {
-                    return !ConfigEntryContainer.class.isAssignableFrom(field.getType()) && !field.isAnnotationPresent(ConfigEntryContainer.Ignore.class);
+                    return !ConfigContainer.class.isAssignableFrom(field.getType()) && !field.isAnnotationPresent(ConfigContainer.Ignore.class);
                 }
                 return field.isAnnotationPresent(ConfigEntry.class);
             }).forEach(field -> {
@@ -50,13 +50,13 @@ public class EntryMap extends ConfigMap<Entry> {
                 return method.isAnnotationPresent(ConfigEntryListener.class) || container.isConfigPOJO() && method.getName().startsWith("set");
             }).forEach(method -> {
                 String fieldName = null;
-                Class<? extends ConfigEntryContainer> fieldClass = clazz;
+                Class<? extends ConfigContainer> fieldClass = clazz;
                 if (method.isAnnotationPresent(ConfigEntryListener.class)) {
                     ConfigEntryListener listener = method.getDeclaredAnnotation(ConfigEntryListener.class);
                     if (!listener.value().equals("")) {
                         fieldName = listener.value();
                     }
-                    if (listener.container() != ConfigEntryContainer.class) {
+                    if (listener.container() != ConfigContainer.class) {
                         fieldClass = listener.container();
                     }
                 }

src/main/java/me/lortseam/completeconfig/data/Listener.java

@@ -3,7 +3,7 @@ package me.lortseam.completeconfig.data;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -13,7 +13,7 @@ public class Listener<T> {
 
     private final Method method;
     @Getter(AccessLevel.PACKAGE)
-    private final ConfigEntryContainer parentObject;
+    private final ConfigContainer parentObject;
 
     void invoke(T value) {
         try {

src/main/java/me/lortseam/completeconfig/data/entry/AnnotatedEntryOrigin.java

@@ -1,7 +1,7 @@
 package me.lortseam.completeconfig.data.entry;
 
 import lombok.Getter;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 
 import java.lang.annotation.Annotation;
@@ -12,7 +12,7 @@ public class AnnotatedEntryOrigin<A extends Annotation> extends EntryOrigin {
     @Getter
     private final A annotation;
 
-    AnnotatedEntryOrigin(Field field, ConfigEntryContainer parentObject, TranslationIdentifier parentTranslation, A annotation) {
+    AnnotatedEntryOrigin(Field field, ConfigContainer parentObject, TranslationIdentifier parentTranslation, A annotation) {
         super(field, parentObject, parentTranslation);
         this.annotation = annotation;
     }

src/main/java/me/lortseam/completeconfig/data/entry/EntryOrigin.java

@@ -3,7 +3,7 @@ package me.lortseam.completeconfig.data.entry;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 
 import java.lang.reflect.Field;
@@ -14,7 +14,7 @@ public class EntryOrigin {
     @Getter
     private final Field field;
     @Getter
-    private final ConfigEntryContainer parentObject;
+    private final ConfigContainer parentObject;
     @Getter
     private final TranslationIdentifier parentTranslation;
 

src/main/java/me/lortseam/completeconfig/data/entry/Transformation.java

@@ -2,7 +2,7 @@ package me.lortseam.completeconfig.data.entry;
 
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.data.Entry;
 import me.lortseam.completeconfig.data.EntryBase;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
@@ -46,14 +46,14 @@ public final class Transformation<O extends EntryOrigin> {
         return predicate.test(base);
     }
 
-    public Entry<?> transform(EntryBase<?> base, ConfigEntryContainer parentObject, TranslationIdentifier parentTranslation) {
+    public Entry<?> transform(EntryBase<?> base, ConfigContainer parentObject, TranslationIdentifier parentTranslation) {
         return transformer.transform(originCreator.create(base.getField(), parentObject, parentTranslation));
     }
 
     @FunctionalInterface
     private interface OriginCreator<O extends EntryOrigin> {
 
-        O create(Field field, ConfigEntryContainer parentObject, TranslationIdentifier parentTranslation);
+        O create(Field field, ConfigContainer parentObject, TranslationIdentifier parentTranslation);
 
     }
 

src/test/java/me/lortseam/completeconfig/ConfigTest.java

@@ -1,6 +1,6 @@
 package me.lortseam.completeconfig;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.data.Config;
 import me.lortseam.completeconfig.data.Entry;
 import me.lortseam.completeconfig.data.EntryBase;
@@ -62,13 +62,13 @@ public class ConfigTest {
 
         @Test
         public void add_throwIfContainersNull() {
-            NullPointerException exception = assertThrows(NullPointerException.class, () -> builder.add((ConfigEntryContainer[]) null));
+            NullPointerException exception = assertThrows(NullPointerException.class, () -> builder.add((ConfigContainer[]) null));
             assertEquals("containers is marked non-null but is null", exception.getMessage());
         }
 
         @Test
         public void add_throwIfContainersContainNullElement() {
-            assertThrows(NullPointerException.class, () -> builder.add((ConfigEntryContainer) null));
+            assertThrows(NullPointerException.class, () -> builder.add((ConfigContainer) null));
         }
 
         @Test

src/test/java/me/lortseam/completeconfig/data/containers/ContainerIncludingContainerWithEntry.java

@@ -1,12 +1,12 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class ContainerIncludingContainerWithEntry implements ConfigEntryContainer {
+public class ContainerIncludingContainerWithEntry implements ConfigContainer {
 
     @Override
-    public ConfigEntryContainer[] getTransitiveContainers() {
-        return new ConfigEntryContainer[]{new ContainerWithEntry()};
+    public ConfigContainer[] getTransitiveContainers() {
+        return new ConfigContainer[]{new ContainerWithEntry()};
     }
 
 }

src/test/java/me/lortseam/completeconfig/data/containers/ContainerIncludingGroupWithEntry.java

@@ -1,9 +1,9 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.data.groups.GroupWithEntry;
 
-public class ContainerIncludingGroupWithEntry implements ConfigEntryContainer {
+public class ContainerIncludingGroupWithEntry implements ConfigContainer {
 
     @Transitive
     private final GroupWithEntry group = new GroupWithEntry();

src/test/java/me/lortseam/completeconfig/data/containers/ContainerNestingStaticContainerWithEntry.java

@@ -1,11 +1,11 @@
 package me.lortseam.completeconfig.data.containers;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class ContainerNestingStaticContainerWithEntry implements ConfigEntryContainer {
+public class ContainerNestingStaticContainerWithEntry implements ConfigContainer {
 
-    public static class ContainerWithEntry implements ConfigEntryContainer {
+    public static class ContainerWithEntry implements ConfigContainer {
 
         @ConfigEntry
         private boolean entry;

src/test/java/me/lortseam/completeconfig/data/containers/ContainerWithContainerWithEntry.java

@@ -1,8 +1,8 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class ContainerWithContainerWithEntry implements ConfigEntryContainer {
+public class ContainerWithContainerWithEntry implements ConfigContainer {
 
     @Transitive
     private final ContainerWithEntry container = new ContainerWithEntry();

src/test/java/me/lortseam/completeconfig/data/containers/ContainerWithEntry.java

@@ -1,9 +1,9 @@
 package me.lortseam.completeconfig.data.containers;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class ContainerWithEntry implements ConfigEntryContainer {
+public class ContainerWithEntry implements ConfigContainer {
 
     @ConfigEntry
     private boolean entry;

src/test/java/me/lortseam/completeconfig/data/containers/ContainerWithField.java

@@ -1,8 +1,8 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class ContainerWithField implements ConfigEntryContainer {
+public class ContainerWithField implements ConfigContainer {
 
     private boolean noEntry;
 

src/test/java/me/lortseam/completeconfig/data/containers/ContainerWithGroupWithEntry.java

@@ -1,9 +1,9 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.data.groups.GroupWithEntry;
 
-public class ContainerWithGroupWithEntry implements ConfigEntryContainer {
+public class ContainerWithGroupWithEntry implements ConfigContainer {
 
     @Transitive
     private final GroupWithEntry group = new GroupWithEntry();

src/test/java/me/lortseam/completeconfig/data/containers/ContainerWithNonAnnotatedContainerWithEntry.java

@@ -1,8 +1,8 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class ContainerWithNonAnnotatedContainerWithEntry implements ConfigEntryContainer {
+public class ContainerWithNonAnnotatedContainerWithEntry implements ConfigContainer {
 
     private final ContainerWithEntry nonAnnotatedContainer = new ContainerWithEntry();
 

src/test/java/me/lortseam/completeconfig/data/containers/ContainerWithStaticEntry.java

@@ -1,9 +1,9 @@
 package me.lortseam.completeconfig.data.containers;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class ContainerWithStaticEntry implements ConfigEntryContainer {
+public class ContainerWithStaticEntry implements ConfigContainer {
 
     @ConfigEntry
     private static boolean entry;

src/test/java/me/lortseam/completeconfig/data/containers/EmptyContainer.java

@@ -1,7 +1,7 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class EmptyContainer implements ConfigEntryContainer {
+public class EmptyContainer implements ConfigContainer {
 
 }

src/test/java/me/lortseam/completeconfig/data/containers/POJOContainerNestingContainerWithEntry.java

@@ -1,16 +1,16 @@
 package me.lortseam.completeconfig.data.containers;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class POJOContainerNestingContainerWithEntry implements ConfigEntryContainer {
+public class POJOContainerNestingContainerWithEntry implements ConfigContainer {
 
     @Override
     public boolean isConfigPOJO() {
         return true;
     }
 
-    public class ContainerWithEntry implements ConfigEntryContainer {
+    public class ContainerWithEntry implements ConfigContainer {
 
         @ConfigEntry
         private boolean entry;

src/test/java/me/lortseam/completeconfig/data/containers/POJOContainerNestingStaticContainerWithEntry.java

@@ -1,16 +1,16 @@
 package me.lortseam.completeconfig.data.containers;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class POJOContainerNestingStaticContainerWithEntry implements ConfigEntryContainer {
+public class POJOContainerNestingStaticContainerWithEntry implements ConfigContainer {
 
     @Override
     public boolean isConfigPOJO() {
         return true;
     }
 
-    public static class ContainerWithEntry implements ConfigEntryContainer {
+    public static class ContainerWithEntry implements ConfigContainer {
 
         @ConfigEntry
         private boolean entry;

src/test/java/me/lortseam/completeconfig/data/containers/POJOContainerWithContainerWithEntry.java

@@ -1,8 +1,8 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class POJOContainerWithContainerWithEntry implements ConfigEntryContainer {
+public class POJOContainerWithContainerWithEntry implements ConfigContainer {
 
     private final ContainerWithEntry container = new ContainerWithEntry();
 

src/test/java/me/lortseam/completeconfig/data/containers/POJOContainerWithEmptyContainer.java

@@ -1,8 +1,8 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class POJOContainerWithEmptyContainer implements ConfigEntryContainer {
+public class POJOContainerWithEmptyContainer implements ConfigContainer {
 
     private EmptyContainer container = new EmptyContainer();
 

src/test/java/me/lortseam/completeconfig/data/containers/POJOContainerWithEntry.java

@@ -1,8 +1,8 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class POJOContainerWithEntry implements ConfigEntryContainer {
+public class POJOContainerWithEntry implements ConfigContainer {
 
     private boolean entry;
 

src/test/java/me/lortseam/completeconfig/data/containers/POJOContainerWithIgnoredField.java

@@ -1,8 +1,8 @@
 package me.lortseam.completeconfig.data.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 
-public class POJOContainerWithIgnoredField implements ConfigEntryContainer {
+public class POJOContainerWithIgnoredField implements ConfigContainer {
 
     @Ignore
     private boolean noEntry;

src/test/java/me/lortseam/completeconfig/data/listeners/CustomListener.java

@@ -1,10 +1,10 @@
 package me.lortseam.completeconfig.data.listeners;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.api.ConfigEntryListener;
 
-public class CustomListener implements ConfigEntryContainer {
+public class CustomListener implements ConfigContainer {
 
     @ConfigEntry
     private boolean value;

src/test/java/me/lortseam/completeconfig/data/listeners/EmptyListener.java

@@ -1,10 +1,10 @@
 package me.lortseam.completeconfig.data.listeners;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.api.ConfigEntryListener;
 
-public class EmptyListener implements ConfigEntryContainer {
+public class EmptyListener implements ConfigContainer {
 
     @ConfigEntry
     private boolean value;

src/test/java/me/lortseam/completeconfig/data/listeners/ForceUpdateListener.java

@@ -1,10 +1,10 @@
 package me.lortseam.completeconfig.data.listeners;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.api.ConfigEntryListener;
 
-public class ForceUpdateListener implements ConfigEntryContainer {
+public class ForceUpdateListener implements ConfigContainer {
 
     @ConfigEntry(forceUpdate = true)
     private boolean value;

src/test/java/me/lortseam/completeconfig/data/listeners/OutsideListener.java

@@ -1,10 +1,10 @@
 package me.lortseam.completeconfig.data.listeners;
 
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.api.ConfigEntryListener;
 import me.lortseam.completeconfig.data.containers.ContainerWithEntry;
 
-public class OutsideListener implements ConfigEntryContainer {
+public class OutsideListener implements ConfigContainer {
 
     @Transitive
     private final ContainerWithEntry container = new ContainerWithEntry();

src/test/java/me/lortseam/completeconfig/data/listeners/SetterListener.java

@@ -1,10 +1,10 @@
 package me.lortseam.completeconfig.data.listeners;
 
 import me.lortseam.completeconfig.api.ConfigEntry;
-import me.lortseam.completeconfig.api.ConfigEntryContainer;
+import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.api.ConfigEntryListener;
 
-public class SetterListener implements ConfigEntryContainer {
+public class SetterListener implements ConfigContainer {
 
     @ConfigEntry
     private boolean value;