From 185df6e8a4fbd2a8cc994d59fd1b7f5af16dee90 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 21 Jul 2021 20:17:45 -0700 Subject: [PATCH] functional events in YamlAddon --- .../com/dfsek/terra/addons/yaml/YamlAddon.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java index 4e394f343..ea6eec090 100644 --- a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java +++ b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java @@ -6,26 +6,23 @@ import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.addon.annotations.Addon; import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; -import com.dfsek.terra.api.event.EventListener; import com.dfsek.terra.api.event.events.config.ConfigurationDiscoveryEvent; import com.dfsek.terra.api.injection.annotations.Inject; @Addon("language-yaml") @Version("1.0.0") @Author("Terra") -public class YamlAddon extends TerraAddon implements EventListener { +public class YamlAddon extends TerraAddon { @Inject private TerraPlugin main; @Override public void initialize() { - main.getEventManager().registerListener(this, this); - } - - public void loadYamlConfigs(ConfigurationDiscoveryEvent event) { - event.getLoader().open("", ".yml").thenEntries(entries -> entries.forEach(entry -> { - main.getDebugLogger().info("Discovered config " + entry.getKey()); - event.register(entry.getKey(), new YamlConfiguration(entry.getValue(), entry.getKey())); - })); + main.getEventManager() + .register(ConfigurationDiscoveryEvent.class) + .then(event -> event.getLoader().open("", ".yml").thenEntries(entries -> entries.forEach(entry -> { + main.getDebugLogger().info("Discovered config " + entry.getKey()); + event.register(entry.getKey(), new YamlConfiguration(entry.getValue(), entry.getKey())); + }))); } }