diff --git a/src/main/java/me/hsgamer/yatpa/YATPA.java b/src/main/java/me/hsgamer/yatpa/YATPA.java index 3f5cd05..855040c 100644 --- a/src/main/java/me/hsgamer/yatpa/YATPA.java +++ b/src/main/java/me/hsgamer/yatpa/YATPA.java @@ -11,8 +11,6 @@ import me.hsgamer.yatpa.config.MainConfig; import me.hsgamer.yatpa.config.MessageConfig; import me.hsgamer.yatpa.cooldown.CooldownManager; -import me.hsgamer.yatpa.hook.HookManager; -import me.hsgamer.yatpa.hook.impl.GrimACHook; import me.hsgamer.yatpa.listener.PlayerListener; import me.hsgamer.yatpa.request.RequestManager; import me.hsgamer.yatpa.teleport.TeleportManager; @@ -42,13 +40,6 @@ public void enable() { registerCommand(new TeleportHereCommand(this)); registerCommand(new TeleportAcceptCommand(this)); registerCommand(new TeleportDenyCommand(this)); - - HookManager hookManager = new HookManager(this); - hookManager.addHook("GrimAC", GrimACHook.class); - hookManager.registerAll(); - hookManager.getRegisteredHooks().forEach((hook) -> { - getLogger().info("Enabled a Hook for " + hook.getHookPlugin()); - }); } @Override diff --git a/src/main/java/me/hsgamer/yatpa/hook/Hook.java b/src/main/java/me/hsgamer/yatpa/hook/Hook.java deleted file mode 100644 index 9c6f0ca..0000000 --- a/src/main/java/me/hsgamer/yatpa/hook/Hook.java +++ /dev/null @@ -1,21 +0,0 @@ -package me.hsgamer.yatpa.hook; - -import me.hsgamer.yatpa.YATPA; - -public abstract class Hook { - - protected final YATPA plugin; - protected final String hookPlugin; - - protected Hook(YATPA plugin, String hookPlugin) { - this.plugin = plugin; - this.hookPlugin = hookPlugin; - } - - protected abstract void onRegister(); - - public String getHookPlugin() { - return hookPlugin; - } - -} diff --git a/src/main/java/me/hsgamer/yatpa/hook/HookManager.java b/src/main/java/me/hsgamer/yatpa/hook/HookManager.java deleted file mode 100644 index ed74937..0000000 --- a/src/main/java/me/hsgamer/yatpa/hook/HookManager.java +++ /dev/null @@ -1,40 +0,0 @@ -package me.hsgamer.yatpa.hook; - -import me.hsgamer.yatpa.YATPA; -import org.bukkit.Bukkit; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -public class HookManager { - - private final YATPA plugin; - private final List registeredHooks; - - public HookManager(YATPA plugin) { - this.plugin = plugin; - this.registeredHooks = new ArrayList<>(); - } - - public void addHook(String pluginName, Class hookClass) { - if (!Bukkit.getPluginManager().isPluginEnabled(pluginName)) return; - try { - Hook hook = hookClass.getDeclaredConstructor(YATPA.class, String.class).newInstance(plugin, pluginName); - registeredHooks.add(hook); - } catch (NoSuchMethodException e) { - throw new RuntimeException("Hook must have a public contructor that equals (YATPA, String)", e); - } catch (InvocationTargetException | IllegalAccessException | InstantiationException e) { - throw new RuntimeException(e); - } - } - - public void registerAll() { - registeredHooks.forEach(Hook::onRegister); - } - - public List getRegisteredHooks() { - return registeredHooks; - } - -} diff --git a/src/main/java/me/hsgamer/yatpa/hook/impl/GrimACHook.java b/src/main/java/me/hsgamer/yatpa/hook/impl/GrimACHook.java deleted file mode 100644 index 34a8e13..0000000 --- a/src/main/java/me/hsgamer/yatpa/hook/impl/GrimACHook.java +++ /dev/null @@ -1,46 +0,0 @@ -package me.hsgamer.yatpa.hook.impl; - -import ac.grim.grimac.api.GrimUser; -import ac.grim.grimac.api.events.FlagEvent; -import me.hsgamer.yatpa.YATPA; -import me.hsgamer.yatpa.event.PostTeleportEvent; -import me.hsgamer.yatpa.hook.Hook; -import org.bukkit.Bukkit; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -public class GrimACHook extends Hook implements Listener { - - private final List exemptPlayers; - - public GrimACHook(YATPA plugin, String hookPlugin) { - super(plugin, hookPlugin); - this.exemptPlayers = new ArrayList<>(); - } - - @Override - public void onRegister() { - Bukkit.getPluginManager().registerEvents(this, super.plugin); - } - - @EventHandler - public void onPostTeleport(PostTeleportEvent event) { - exemptPlayers.add(event.getRequestEntry().requester); - Bukkit.getScheduler().runTaskLater(super.plugin, () -> { - exemptPlayers.remove(event.getRequestEntry().requester); - }, 40); - } - - @EventHandler - public void onFlag(FlagEvent event) { - GrimUser user = event.getPlayer(); - if (!exemptPlayers.contains(user.getUniqueId())) return; - - event.setCancelled(true); - } - -}