mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-02 07:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load parse options before registering metaconfig

Browse Source
This commit is contained in:
Astrash 2024-10-30 12:39:05 +11:00
parent 5e43f0afef
commit 2c8d3416ab
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
View File

@ -171,6 +171,11 @@ public class ConfigPackImpl implements ConfigPack {
selfLoader.load(addonsTemplate, packManifest); selfLoader.load(addonsTemplate, packManifest);
this.addons = addonsTemplate.getAddons(); this.addons = addonsTemplate.getAddons();
ConfigPackExpressionOptionsTemplate expressionOptionsTemplate = new ConfigPackExpressionOptionsTemplate();
selfLoader.load(expressionOptionsTemplate, packManifest);
this.parseOptions = expressionOptionsTemplate.getParseOptions();
Map<String, Configuration> configurations = discoverConfigurations(); Map<String, Configuration> configurations = discoverConfigurations();
registerMeta(configurations); registerMeta(configurations);
@ -179,10 +184,6 @@ public class ConfigPackImpl implements ConfigPack {
selfLoader.load(template, packManifest); selfLoader.load(template, packManifest);
ConfigPackExpressionOptionsTemplate expressionOptionsTemplate = new ConfigPackExpressionOptionsTemplate();
selfLoader.load(expressionOptionsTemplate, packManifest);
this.parseOptions = expressionOptionsTemplate.getParseOptions();
String namespace; String namespace;
String id; String id;
if(template.getID().contains(":")) { if(template.getID().contains(":")) {