diff --git a/pom.xml b/pom.xml index 46b0298..44d43be 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,10 @@ bungeecord-repo https://oss.sonatype.org/content/repositories/snapshots + + essentialsx-repo + https://repo.essentialsx.net/snapshots/ + @@ -150,6 +154,22 @@ 0.96.7.0 provided + + net.essentialsx + EssentialsXDiscord + 2.19.0-SNAPSHOT + provided + + + org.bstats + bstats-bukkit + + + net.dv8tion + JDA + + + net.md-5 bungeecord-api diff --git a/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java b/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java index 163b08d..b7d647b 100644 --- a/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.util.Set; +import net.essentialsx.api.v2.services.discord.DiscordService; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -33,6 +34,7 @@ import mineverse.Aust1n46.chat.utilities.Format; //This class listens to chat through the chat event and handles the bulk of the chat channels and formatting. public class ChatListener implements Listener { + private final boolean essentialsDiscordHook = Bukkit.getPluginManager().isPluginEnabled("EssentialsDiscord"); private MineverseChat plugin = MineverseChat.getInstance(); @EventHandler(priority = EventPriority.NORMAL) @@ -525,6 +527,10 @@ public class ChatListener implements Listener { Format.sendPacketPlayOutChat(p, packet); } Bukkit.getConsoleSender().sendMessage(consoleChat); + + if (essentialsDiscordHook && channel.isDefaultchannel()) { + Bukkit.getServicesManager().load(DiscordService.class).sendChatMessage(mcp.getPlayer(), chat); + } return; } else { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 1ec024a..05f2db2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,19 +3,19 @@ version: ${project.version} api-version: 1.13 main: mineverse.Aust1n46.chat.MineverseChat depend: [Vault, ProtocolLib, PlaceholderAPI] -softdepend: [Towny, Factions, Heroes] +softdepend: [Towny, Factions, Heroes, EssentialsDiscord] author: Aust1n46 website: https://bitbucket.org/Aust1n46/venturechat/ description: #1 Channels Chat plugin! Spigot + Bungee. Supports PlaceholderAPI + JSON formatting. Moderation GUI! -commands: - mute: - usage: /mute [playername] [channel] - aliases: [mp,vmute] - description: Mutes player in a channel so they cannot talk. - permission-message: You don't have - unmute: - usage: /unmute [playername] [channel] - aliases: [ump,vunmute] +commands: + mute: + usage: /mute [playername] [channel] + aliases: [mp,vmute] + description: Mutes player in a channel so they cannot talk. + permission-message: You don't have + unmute: + usage: /unmute [playername] [channel] + aliases: [ump,vunmute] description: Unmutes player in a channel so they can talk again. permission-message: You don't have msg: