From 7363a305afb6640713c693f9e82d7ea55a2c7182 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 21 Jul 2021 20:13:59 -0700 Subject: [PATCH] functional events in StructureAddon --- .../dfsek/terra/addons/structure/StructureAddon.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java index 4824b8a11..004bf5097 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java @@ -5,7 +5,6 @@ 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.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; @@ -13,16 +12,14 @@ import com.dfsek.terra.api.structure.configured.ConfiguredStructure; @Addon("config-structure") @Version("1.0.0") @Author("Terra") -public class StructureAddon extends TerraAddon implements EventListener { +public class StructureAddon extends TerraAddon { @Inject private TerraPlugin main; @Override public void initialize() { - main.getEventManager().registerListener(this, this); - } - - public void onConfigLoad(ConfigPackPreLoadEvent event) { - event.getPack().applyLoader(ConfiguredStructure.class, (t, o, l) -> null); + main.getEventManager() + .register(ConfigPackPreLoadEvent.class) + .then(event -> event.getPack().applyLoader(ConfiguredStructure.class, (t, o, l) -> null)); } }