From 2c8d3416abbf7c5fe3f4561de5fe2b0e6a8bc244 Mon Sep 17 00:00:00 2001 From: Astrash Date: Wed, 30 Oct 2024 12:39:05 +1100 Subject: [PATCH] Load parse options before registering metaconfig --- .../java/com/dfsek/terra/config/pack/ConfigPackImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index 50e0ad154..8aa12c790 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -171,6 +171,11 @@ private ConfigPackImpl(Loader loader, Configuration packManifest, Platform platf selfLoader.load(addonsTemplate, packManifest); this.addons = addonsTemplate.getAddons(); + ConfigPackExpressionOptionsTemplate expressionOptionsTemplate = new ConfigPackExpressionOptionsTemplate(); + selfLoader.load(expressionOptionsTemplate, packManifest); + this.parseOptions = expressionOptionsTemplate.getParseOptions(); + + Map configurations = discoverConfigurations(); registerMeta(configurations); @@ -179,10 +184,6 @@ private ConfigPackImpl(Loader loader, Configuration packManifest, Platform platf selfLoader.load(template, packManifest); - ConfigPackExpressionOptionsTemplate expressionOptionsTemplate = new ConfigPackExpressionOptionsTemplate(); - selfLoader.load(expressionOptionsTemplate, packManifest); - this.parseOptions = expressionOptionsTemplate.getParseOptions(); - String namespace; String id; if(template.getID().contains(":")) {