mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-18 14:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

move config discovery to separate method

Browse Source
This commit is contained in:
dfsek
2021-12-04 20:40:07 -07:00
parent cb90563519
commit 72488c9d18
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
+11 -8
View File
@@ -168,6 +168,9 @@ public class ConfigPackImpl implements ConfigPack {
selfLoader.load(addonsTemplate, packManifest); selfLoader.load(addonsTemplate, packManifest);
this.addons = addonsTemplate.getAddons(); this.addons = addonsTemplate.getAddons();
Map<String, Configuration> configurations = discoverConfigurations();
registerMeta(configurations);
platform.getEventManager().callEvent( platform.getEventManager().callEvent(
new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, packManifest))); new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, packManifest)));
@@ -177,14 +180,6 @@ public class ConfigPackImpl implements ConfigPack {
configTypes.values().forEach(list -> list.forEach(pair -> configTypeRegistry.register(pair.getLeft(), pair.getRight()))); configTypes.values().forEach(list -> list.forEach(pair -> configTypeRegistry.register(pair.getLeft(), pair.getRight())));
Map<String, Configuration> configurations = new HashMap<>();
platform.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this, loader,
(s, c) -> configurations.put(s.replace("\\", "/"),
c))); // Create all the configs.
registerMeta(configurations);
Map<ConfigType<? extends ConfigTemplate, ?>, List<Configuration>> configs = new HashMap<>(); Map<ConfigType<? extends ConfigTemplate, ?>, List<Configuration>> configs = new HashMap<>();
for(Configuration configuration : configurations.values()) { // Sort the configs for(Configuration configuration : configurations.values()) { // Sort the configs
@@ -224,6 +219,14 @@ public class ConfigPackImpl implements ConfigPack {
checkDeadEntries(); checkDeadEntries();
} }
private Map<String, Configuration> discoverConfigurations() {
Map<String, Configuration> configurations = new HashMap<>();
platform.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this, loader,
(s, c) -> configurations.put(s.replace("\\", "/"),
c))); // Create all the configs.
return configurations;
}
private void registerMeta(Map<String, Configuration> configurations) { private void registerMeta(Map<String, Configuration> configurations) {
MetaStringPreprocessor stringPreprocessor = new MetaStringPreprocessor(configurations); MetaStringPreprocessor stringPreprocessor = new MetaStringPreprocessor(configurations);
selfLoader.registerPreprocessor(Meta.class, stringPreprocessor); selfLoader.registerPreprocessor(Meta.class, stringPreprocessor);