Browse Source

Minor changes and fixes

Lortseam 5 years ago
parent
commit
add061087e
3 changed files with 10 additions and 11 deletions
  1. 0 2
      gradle.properties
  2. 2 0
      settings.gradle
  3. 8 9
      src/main/java/me/lortseam/completeconfig/ConfigManager.java

+ 0 - 2
gradle.properties

@@ -13,7 +13,5 @@ org.gradle.jvmargs=-Xmx1G
 	archives_base_name = completeconfig
 
 # Dependencies
-	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.5.1+build.294-1.15
 	cloth_config_version=2.11.2
 	lombok_version=1.18.12

+ 2 - 0
settings.gradle

@@ -8,3 +8,5 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+
+rootProject.name = 'completeconfig'

+ 8 - 9
src/main/java/me/lortseam/completeconfig/ConfigManager.java

@@ -96,11 +96,11 @@ public class ConfigManager {
             });
             LinkedHashMap<String, Entry> clazzEntries = new LinkedHashMap<>();
             Arrays.stream(clazz.getDeclaredFields()).filter(field -> {
-                if (Modifier.isStatic(field.getModifiers()) || field.isAnnotationPresent(ConfigEntryContainer.Transitive.class)) {
+                if (Modifier.isStatic(field.getModifiers())) {
                     return false;
                 }
                 if (container.isConfigPOJO()) {
-                    return !field.isAnnotationPresent(ConfigEntry.Ignore.class);
+                    return !ConfigEntryContainer.class.isAssignableFrom(field.getType()) && !field.isAnnotationPresent(ConfigEntry.Ignore.class);
                 }
                 return field.isAnnotationPresent(ConfigEntry.class);
             }).forEach(field -> {
@@ -200,15 +200,14 @@ public class ConfigManager {
             }
             if (container.isConfigPOJO()) {
                 return ConfigEntryContainer.class.isAssignableFrom(field.getType());
-            } else {
-                if (field.isAnnotationPresent(ConfigEntryContainer.Transitive.class)) {
-                    if (!ConfigEntryContainer.class.isAssignableFrom(field.getType())) {
-                        throw new RuntimeException("@ConfigEntryContainer.Transitive is not applicable on field type " + field.getType());
-                    }
-                    return true;
+            }
+            if (field.isAnnotationPresent(ConfigEntryContainer.Transitive.class)) {
+                if (!ConfigEntryContainer.class.isAssignableFrom(field.getType())) {
+                    throw new RuntimeException("@ConfigEntryContainer.Transitive is not applicable on field type " + field.getType());
                 }
-                return false;
+                return true;
             }
+            return false;
         }).map(field -> {
             if (!field.isAccessible()) {
                 field.setAccessible(true);