functional events in FabricAddon

platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java

@@ -14,13 +14,9 @@ import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.PluginConfig;
-import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.EventManager;
-import com.dfsek.terra.api.event.annotations.Global;
-import com.dfsek.terra.api.event.annotations.Priority;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.events.config.type.ConfigTypePostLoadEvent;
 import com.dfsek.terra.api.handle.ItemHandle;
 import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.lang.Language;
@@ -69,7 +65,6 @@ import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.decorator.Decorator;
 import net.minecraft.world.gen.decorator.NopeDecoratorConfig;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.ConfiguredFeatures;
 import net.minecraft.world.gen.feature.DefaultFeatureConfig;
 import net.minecraft.world.gen.feature.FeatureConfig;
 import org.apache.commons.io.FileUtils;
@@ -288,16 +283,14 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
     @Addon("Terra-Fabric")
     @Author("Terra")
     @Version("1.0.0")
-    public final class FabricAddon extends TerraAddon implements EventListener {
+    public final class FabricAddon extends TerraAddon {
         private final Map<ConfigPack, Pair<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> templates = new HashMap<>();
 
         @Override
         public void initialize() {
-            eventManager.registerListener(this, this);
+            eventManager
-        }
+                    .register(ConfigPackPreLoadEvent.class)
-
+                    .then(event -> {
-        @Global
-        public void onPackLoad(ConfigPackPreLoadEvent event) {
                         PreLoadCompatibilityOptions template = new PreLoadCompatibilityOptions();
                         try {
                             event.loadTemplate(template);
@@ -317,12 +310,12 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
                             });
                         }
                         templates.put(event.getPack(), Pair.of(template, null));
+                    })
+                    .global();
 
-        }
+            eventManager
-
+                    .register(ConfigPackPostLoadEvent.class)
-        @Priority(Priority.HIGHEST)
+                    .then(event -> {
-        @Global
-        public void createInjectionOptions(ConfigPackPostLoadEvent event) {
                         PostLoadCompatibilityOptions template = new PostLoadCompatibilityOptions();
 
                         try {
@@ -332,24 +325,32 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
                         }
 
                         templates.get(event.getPack()).setRight(template);
-        }
+                    })
+                    .priority(100)
+                    .global();
 
-        @Global
+            eventManager
-        public void injectBiomes(BiomeRegistrationEvent event) {
+                    .register(BiomeRegistrationEvent.class)
+                    .then(event -> {
                         logger.info("Registering biomes...");
                         Registry<Biome> biomeRegistry = event.getRegistryManager().get(Registry.BIOME_KEY);
                         configRegistry.forEach(pack -> pack.getCheckedRegistry(TerraBiome.class).forEach((id, biome) -> FabricUtil.registerOrOverwrite(biomeRegistry, Registry.BIOME_KEY, new Identifier("terra", FabricUtil.createBiomeID(pack, id)), FabricUtil.createBiome(biome, pack, event.getRegistryManager())))); // Register all Terra biomes.
                         logger.info("Biomes registered.");
-        }
+                    })
+                    .global();
 
-        @Global
+            eventManager
-        public void initializePacks(GameInitializationEvent event) {
+                    .register(GameInitializationEvent.class)
+                    .then(event -> {
                         TerraFabricPlugin main = TerraFabricPlugin.getInstance();
                         main.logger().info("Loading config packs...");
                         configRegistry.loadAll(TerraFabricPlugin.this);
                         logger.info("Loaded packs.");
+                    })
+                    .global();
         }
 
+
         private void injectTree(CheckedRegistry<Tree> registry, String id, ConfiguredFeature<?, ?> tree) {
             try {
                 registry.register(id, (Tree) tree);