Add Essentials Muting & Fix Webhook Username Colors

Author: FireController1847

pom.xml

@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <actualVersion>1.0.2</actualVersion>
+        <actualVersion>1.0.3</actualVersion>
         <fileVersion>INVALID</fileVersion>
         <projectVersion>INVALID</projectVersion>
     </properties>
@@ -52,6 +52,14 @@
             <id>placeholderapi</id>
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
+        <repository>
+            <id>essentials-repo</id>
+            <url>https://repo.essentialsx.net/snapshots/</url>
+        </repository>
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/maven-public</url>
+        </repository>
     </repositories>
 
     <!-- Build -->
@@ -221,6 +229,14 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- BUILD: Essentials -->
+        <dependency>
+            <groupId>net.essentialsx</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.19.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
 </project>

src/main/java/com/firecontroller1847/truediscordlink/DiscordManager.java

@@ -336,7 +336,7 @@ private void sendDiscordWebhookMessage(String content, Player player) {
             skin = discordlink.getConfig().getString("webhooks.skins_url");
             if (skin != null) {
                 skin = skin.replace("%uuid%", player.getUniqueId().toString());
-                skin = skin.replace("%name%",player.getName());
+                skin = skin.replace("%name%", TrueDiscordLink.stripColorCodes(player.getName()));
             }
         }
 
@@ -348,7 +348,7 @@ private void sendDiscordWebhookMessage(String content, Player player) {
                     new String[] { "%name%" , player.getName() },
                     new String[] { "%displayName%", player.getDisplayName() },
                     new String[] { "%uuid%", player.getUniqueId().toString() }
-                ), player.getDisplayName(), skin);
+                ), player.getDisplayName(), skin); // TODO: Why is the username not customizable
             } else {
                 this.makeWebhookRequest(url, content);
             }
@@ -367,7 +367,7 @@ private void makeWebhookRequest(String url, String content, String username, Str
             JsonObject object = new JsonObject();
             object.addProperty("content", content);
             if (username != null) {
-                object.addProperty("username", username);
+                object.addProperty("username", TrueDiscordLink.stripColorCodes(username));
             }
             if (skin != null) {
                 object.addProperty("avatar_url", skin);

src/main/java/com/firecontroller1847/truediscordlink/TrueDiscordLink.java

@@ -1,5 +1,6 @@
 package com.firecontroller1847.truediscordlink;
 
+import com.earth2me.essentials.Essentials;
 import com.firecontroller1847.truediscordlink.commands.CommandTrueDiscordLink;
 import com.firecontroller1847.truediscordlink.listeners.minecraft.*;
 import com.firecontroller1847.truediscordlink.tabcompleters.TabCompleterTrueDiscordLink;
@@ -13,6 +14,7 @@ public class TrueDiscordLink extends FirePlugin {
 
     // Dependent Plugins
     private PlaceholderAPIPlugin placeholderApi;
+    private Essentials essentialsApi;
 
     // Managers
     private VersionHelper versionHelper;
@@ -24,6 +26,7 @@ public class TrueDiscordLink extends FirePlugin {
     public boolean onAfterConfiguration() {
         // Load dependent plugins
         placeholderApi = (PlaceholderAPIPlugin) this.loadPlugin("PlaceholderAPI");
+        essentialsApi = (Essentials) this.loadPlugin("Essentials");
 
         // Ensure that we are configured
         if (!this.getConfig().getBoolean("configured")) {
@@ -75,6 +78,9 @@ public String escapeDiscordFormatting(String content) {
     public PlaceholderAPIPlugin getPlaceholderApi() {
         return placeholderApi;
     }
+    public Essentials getEssentialsApi() {
+        return essentialsApi;
+    }
     public VersionHelper getVersionHelper() {
         return versionHelper;
     }
@@ -84,4 +90,5 @@ public DiscordManager getDiscordManager() {
     public DatabaseManager getDatabaseManager() {
         return databaseManager;
     }
+
 }

src/main/java/com/firecontroller1847/truediscordlink/listeners/minecraft/PlayerChatListener.java

@@ -1,5 +1,6 @@
 package com.firecontroller1847.truediscordlink.listeners.minecraft;
 
+import com.earth2me.essentials.User;
 import com.firecontroller1847.truediscordlink.TrueDiscordLink;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -19,6 +20,13 @@ public PlayerChatListener(TrueDiscordLink discordlink) {
 
     @EventHandler
     public void onPlayerChat(AsyncPlayerChatEvent event) {
+        if (discordlink.getEssentialsApi() != null) {
+            User user = discordlink.getEssentialsApi().getUser(event.getPlayer().getUniqueId());
+            if (user != null && user.isMuted()) {
+                return;
+            }
+        }
+
         // Send Discord Message
         ArrayList<String[]> modifications = discordlink.getDiscordManager().sendDiscordMessage(event.getMessage(), false, event.getPlayer());
 

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 # Run Information
 api-version: "1.15"
 main: com.firecontroller1847.truediscordlink.TrueDiscordLink
-softdepend: [PlaceholderAPI]
+softdepend: [PlaceholderAPI, Essentials]
 load: POSTWORLD
 
 # Metadata Information