From 315da531b78376fb6c6b9dd40e03d8132afe3efe Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 21 Jul 2021 20:16:42 -0700 Subject: [PATCH] delete TerraListener --- .../dfsek/terra/bukkit/TerraBukkitPlugin.java | 3 +- .../terra/bukkit/listeners/TerraListener.java | 33 ------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index df69e303f..289cf518f 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -33,7 +33,6 @@ import com.dfsek.terra.bukkit.handles.BukkitWorldHandle; import com.dfsek.terra.bukkit.listeners.CommonListener; import com.dfsek.terra.bukkit.listeners.PaperListener; import com.dfsek.terra.bukkit.listeners.SpigotListener; -import com.dfsek.terra.bukkit.listeners.TerraListener; import com.dfsek.terra.bukkit.util.PaperUtil; import com.dfsek.terra.bukkit.world.BukkitBiome; import com.dfsek.terra.bukkit.world.BukkitWorld; @@ -343,7 +342,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin { @Override public void initialize() { - main.getEventManager().registerListener(this, new TerraListener(main)); + } } } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java deleted file mode 100644 index c28474109..000000000 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.dfsek.terra.bukkit.listeners; - -import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.event.EventListener; -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.ConfigPackPreLoadEvent; -import com.dfsek.terra.api.registry.exception.DuplicateEntryException; -import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.bukkit.world.BukkitAdapter; -import com.dfsek.terra.bukkit.world.BukkitTree; -import org.bukkit.TreeType; - -public class TerraListener implements EventListener { - private final TerraPlugin main; - - public TerraListener(TerraPlugin main) { - this.main = main; - } - - @Global - @Priority(Priority.LOWEST) - public void injectTrees(ConfigPackPreLoadEvent event) { - for(TreeType value : TreeType.values()) { - try { - String id = BukkitAdapter.TREE_TRANSFORMER.translate(value); - event.getPack().getCheckedRegistry(Tree.class).register(id, new BukkitTree(value, main)); - event.getPack().getCheckedRegistry(Tree.class).get(id); // Platform trees should never be marked "dead" - } catch(DuplicateEntryException ignore) { // If another com.dfsek.terra.addon has already registered trees, do nothing. - } - } - } -}