mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-08-30 05:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

original map keys take priority over metamap

Browse Source
This commit is contained in:
dfsek
2021-12-09 15:56:43 -07:00
parent 15b0e265cc
commit 39a62edc7d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java
+3 -6
View File
@@ -50,11 +50,8 @@ public class MetaMapPreprocessor extends MetaPreprocessor<Meta> {
if(Map.class.isAssignableFrom(baseClass) && c instanceof Map) { // Map metaconfig if(Map.class.isAssignableFrom(baseClass) && c instanceof Map) { // Map metaconfig
Map<Object, Object> map = (Map<Object, Object>) c; Map<Object, Object> map = (Map<Object, Object>) c;
Map<Object, Object> newMap = new HashMap<>(map);
if(map.containsKey("<<")) { if(map.containsKey("<<")) {
newMap.putAll(map); Map<Object, Object> newMap = new HashMap<>(map);
newMap.remove("<<"); // Remove placeholder
List<String> keys = (List<String>) loader.loadType(STRING_LIST.getAnnotatedType(), map.get("<<")); List<String> keys = (List<String>) loader.loadType(STRING_LIST.getAnnotatedType(), map.get("<<"));
keys.forEach(key -> { keys.forEach(key -> {
@@ -65,10 +62,10 @@ public class MetaMapPreprocessor extends MetaPreprocessor<Meta> {
} }
newMap.putAll((Map<?, ?>) meta); newMap.putAll((Map<?, ?>) meta);
}); });
newMap.putAll(map);
newMap.remove("<<"); // Remove placeholder
return (Result<T>) Result.overwrite(newMap); return (Result<T>) Result.overwrite(newMap);
} }
} }
} }
} }