From 6e67787083bc25a96c00e4bf4ec23c2c7602295d Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 15 Nov 2016 21:15:23 +0100 Subject: [PATCH] Moved listeners --- src/main/java/buttondevteam/discordplugin/DiscordPlugin.java | 3 +++ .../discordplugin/{ => listeners}/CommandListener.java | 3 ++- .../discordplugin/{ => listeners}/ExceptionListener.java | 3 ++- .../discordplugin/{ => listeners}/MCListener.java | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) rename src/main/java/buttondevteam/discordplugin/{ => listeners}/CommandListener.java (93%) rename src/main/java/buttondevteam/discordplugin/{ => listeners}/ExceptionListener.java (87%) rename src/main/java/buttondevteam/discordplugin/{ => listeners}/MCListener.java (91%) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index c87efee..23fe966 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -14,6 +14,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import buttondevteam.discordplugin.listeners.CommandListener; +import buttondevteam.discordplugin.listeners.ExceptionListener; +import buttondevteam.discordplugin.listeners.MCListener; import buttondevteam.discordplugin.mccommands.DiscordMCCommandBase; import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.lib.chat.TBMCChatAPI; diff --git a/src/main/java/buttondevteam/discordplugin/CommandListener.java b/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java similarity index 93% rename from src/main/java/buttondevteam/discordplugin/CommandListener.java rename to src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java index c5f1b81..bd7ff06 100644 --- a/src/main/java/buttondevteam/discordplugin/CommandListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java @@ -1,5 +1,6 @@ -package buttondevteam.discordplugin; +package buttondevteam.discordplugin.listeners; +import buttondevteam.discordplugin.DiscordPlugin; import buttondevteam.discordplugin.commands.DiscordCommandBase; import sx.blah.discord.api.events.IListener; import sx.blah.discord.handle.impl.events.MentionEvent; diff --git a/src/main/java/buttondevteam/discordplugin/ExceptionListener.java b/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java similarity index 87% rename from src/main/java/buttondevteam/discordplugin/ExceptionListener.java rename to src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java index 85059ba..4375819 100644 --- a/src/main/java/buttondevteam/discordplugin/ExceptionListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java @@ -1,9 +1,10 @@ -package buttondevteam.discordplugin; +package buttondevteam.discordplugin.listeners; import org.apache.commons.lang.exception.ExceptionUtils; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import buttondevteam.discordplugin.DiscordPlugin; import buttondevteam.lib.TBMCExceptionEvent; public class ExceptionListener implements Listener { diff --git a/src/main/java/buttondevteam/discordplugin/MCListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java similarity index 91% rename from src/main/java/buttondevteam/discordplugin/MCListener.java rename to src/main/java/buttondevteam/discordplugin/listeners/MCListener.java index ea2f193..a600907 100644 --- a/src/main/java/buttondevteam/discordplugin/MCListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java @@ -1,4 +1,4 @@ -package buttondevteam.discordplugin; +package buttondevteam.discordplugin.listeners; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -6,6 +6,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.server.ServerCommandEvent; +import buttondevteam.discordplugin.DiscordPlayer; +import buttondevteam.discordplugin.DiscordPlugin; import buttondevteam.discordplugin.commands.ConnectCommand; import buttondevteam.lib.TBMCPlayerGetInfoEvent; import buttondevteam.lib.TBMCPlayerJoinEvent;