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 b2e546350..61abcffb9 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 @@ -107,12 +107,9 @@ public class ConfigPackImpl implements ConfigPack { private final AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader(); private final ConfigLoader selfLoader = new ConfigLoader(); - private final Scope varScope = new Scope(); private final Platform platform; private final Loader loader; - private final Configuration packManifest; - private final Map addons; private final BiomeProvider seededBiomeProvider; @@ -159,10 +156,8 @@ public class ConfigPackImpl implements ConfigPack { this.loader = loader; this.platform = platform; - this.packManifest = packManifest; this.configTypeRegistry = createRegistry(); - register(selfLoader); platform.register(selfLoader); @@ -182,10 +177,6 @@ public class ConfigPackImpl implements ConfigPack { configTypes.values().forEach(list -> list.forEach(pair -> configTypeRegistry.register(pair.getLeft(), pair.getRight()))); - for(Map.Entry var : template.getVariables().entrySet()) { - varScope.create(var.getKey(), var.getValue()); - } - Map configurations = new HashMap<>(); platform.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this, loader, (s, c) -> configurations.put(s.replace("\\","/"), c))); // Create all the configs. @@ -238,7 +229,7 @@ public class ConfigPackImpl implements ConfigPack { platform.getEventManager().callEvent(new ConfigTypePostLoadEvent(configType, registry, this)); } - platform.getEventManager().callEvent(new ConfigPackPostLoadEvent(this, template -> selfLoader.load(template, this.packManifest))); + platform.getEventManager().callEvent(new ConfigPackPostLoadEvent(this, template -> selfLoader.load(template, packManifest))); logger.info("Loaded config pack \"{}\" v{} by {} in {}ms.", template.getID(), template.getVersion(), template.getAuthor(), (System.nanoTime() - start) / 1000000.0D);