From 7902bb9a4698757e15e3d9f3c26201af99c33204 Mon Sep 17 00:00:00 2001 From: Shiewk Date: Mon, 29 Jul 2024 15:12:23 +0200 Subject: [PATCH] Refactor listeners --- src/main/java/de/shiewk/smoderation/SModeration.java | 12 ++++-------- .../CustomInventoryListener.java} | 4 ++-- .../EnderchestSeeListener.java} | 4 ++-- .../InvSeeListener.java} | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) rename src/main/java/de/shiewk/smoderation/{event/CustomInventoryEvents.java => listener/CustomInventoryListener.java} (85%) rename src/main/java/de/shiewk/smoderation/{event/EnderchestSeeEvents.java => listener/EnderchestSeeListener.java} (90%) rename src/main/java/de/shiewk/smoderation/{event/InvSeeEvents.java => listener/InvSeeListener.java} (91%) diff --git a/src/main/java/de/shiewk/smoderation/SModeration.java b/src/main/java/de/shiewk/smoderation/SModeration.java index f30a550..6bbdb7a 100644 --- a/src/main/java/de/shiewk/smoderation/SModeration.java +++ b/src/main/java/de/shiewk/smoderation/SModeration.java @@ -1,12 +1,8 @@ package de.shiewk.smoderation; import de.shiewk.smoderation.command.*; -import de.shiewk.smoderation.event.CustomInventoryEvents; -import de.shiewk.smoderation.event.EnderchestSeeEvents; -import de.shiewk.smoderation.event.InvSeeEvents; import de.shiewk.smoderation.input.ChatInputListener; -import de.shiewk.smoderation.listener.PunishmentListener; -import de.shiewk.smoderation.listener.VanishListener; +import de.shiewk.smoderation.listener.*; import de.shiewk.smoderation.storage.PunishmentContainer; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; @@ -48,9 +44,9 @@ public final class SModeration extends JavaPlugin { @Override public void onEnable() { getPluginManager().registerEvents(new PunishmentListener(), this); - getPluginManager().registerEvents(new CustomInventoryEvents(), this); - getPluginManager().registerEvents(new InvSeeEvents(), this); - getPluginManager().registerEvents(new EnderchestSeeEvents(), this); + getPluginManager().registerEvents(new CustomInventoryListener(), this); + getPluginManager().registerEvents(new InvSeeListener(), this); + getPluginManager().registerEvents(new EnderchestSeeListener(), this); getPluginManager().registerEvents(new VanishListener(), this); getPluginManager().registerEvents(new ChatInputListener(), this); diff --git a/src/main/java/de/shiewk/smoderation/event/CustomInventoryEvents.java b/src/main/java/de/shiewk/smoderation/listener/CustomInventoryListener.java similarity index 85% rename from src/main/java/de/shiewk/smoderation/event/CustomInventoryEvents.java rename to src/main/java/de/shiewk/smoderation/listener/CustomInventoryListener.java index 3cf21ec..26dcb88 100644 --- a/src/main/java/de/shiewk/smoderation/event/CustomInventoryEvents.java +++ b/src/main/java/de/shiewk/smoderation/listener/CustomInventoryListener.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.event; +package de.shiewk.smoderation.listener; import de.shiewk.smoderation.inventory.CustomInventory; import org.bukkit.event.EventHandler; @@ -6,7 +6,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; -public class CustomInventoryEvents implements Listener { +public class CustomInventoryListener implements Listener { @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onInventoryClick(InventoryClickEvent event){ if (event.getInventory().getHolder() instanceof CustomInventory customInventory){ diff --git a/src/main/java/de/shiewk/smoderation/event/EnderchestSeeEvents.java b/src/main/java/de/shiewk/smoderation/listener/EnderchestSeeListener.java similarity index 90% rename from src/main/java/de/shiewk/smoderation/event/EnderchestSeeEvents.java rename to src/main/java/de/shiewk/smoderation/listener/EnderchestSeeListener.java index 8e86474..787f96b 100644 --- a/src/main/java/de/shiewk/smoderation/event/EnderchestSeeEvents.java +++ b/src/main/java/de/shiewk/smoderation/listener/EnderchestSeeListener.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.event; +package de.shiewk.smoderation.listener; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; @@ -8,7 +8,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.PlayerInventory; -public class EnderchestSeeEvents implements Listener { +public class EnderchestSeeListener implements Listener { @EventHandler public void onInventoryClick(InventoryClickEvent event){ diff --git a/src/main/java/de/shiewk/smoderation/event/InvSeeEvents.java b/src/main/java/de/shiewk/smoderation/listener/InvSeeListener.java similarity index 91% rename from src/main/java/de/shiewk/smoderation/event/InvSeeEvents.java rename to src/main/java/de/shiewk/smoderation/listener/InvSeeListener.java index cd26f06..0a9d7b9 100644 --- a/src/main/java/de/shiewk/smoderation/event/InvSeeEvents.java +++ b/src/main/java/de/shiewk/smoderation/listener/InvSeeListener.java @@ -1,4 +1,4 @@ -package de.shiewk.smoderation.event; +package de.shiewk.smoderation.listener; import org.bukkit.entity.HumanEntity; import org.bukkit.event.EventHandler; @@ -9,7 +9,7 @@ import org.bukkit.inventory.PlayerInventory; import java.util.Objects; -public class InvSeeEvents implements Listener { +public class InvSeeListener implements Listener { @EventHandler public void onInventoryClick(InventoryClickEvent event){