Added Support for Color codes in syntax - Removed DCChat.admin perm

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.tamion</groupId>
     <artifactId>DCChat</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <packaging>jar</packaging>
 
     <name>DCChat</name>

src/main/java/de/tamion/discord/DCMain.java

@@ -3,7 +3,7 @@
 import de.tamion.discord.listeners.Console;
 import de.tamion.discord.listeners.DCChat;
 import de.tamion.minecraft.MCMain;
-import de.tamion.minecraft.listeners.Chat;
+import de.tamion.minecraft.listeners.MCChat;
 import de.tamion.minecraft.listeners.JoinLeave;
 import de.tamion.others.DCChatConsoleAppender;
 import de.tamion.others.Schedulers;
@@ -49,7 +49,7 @@ public static void startup() {
             Schedulers.consolescheduler();
             Schedulers.updatesyntaxchannel();
             PluginManager pluginManager = Bukkit.getPluginManager();
-            pluginManager.registerEvents(new Chat(), MCMain.getPlugin());
+            pluginManager.registerEvents(new MCChat(), MCMain.getPlugin());
             pluginManager.registerEvents(new JoinLeave(), MCMain.getPlugin());
             EmbedBuilder eb = new EmbedBuilder();
             eb.setTitle(config.getString("Bot.startsyntax"));

src/main/java/de/tamion/discord/listeners/DCChat.java

@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 
 public class DCChat extends ListenerAdapter {
@@ -23,12 +24,12 @@ public void onMessageReceived(MessageReceivedEvent e) {
         if(e.getAuthor().isBot()) {
             return;
         }
-        if(e.getMessage().getContentDisplay().startsWith("/")) {
+        if(msg.startsWith("/")) {
             return;
         }
         if(config.getString("Bot.mcsyntax").equals("")) {
             return;
         }
-        Bukkit.getServer().broadcastMessage(config.getString("Bot.mcsyntax").replaceAll("\\{username}", e.getMember().getEffectiveName()).replaceAll("\\{message}", msg));
+        Bukkit.getServer().broadcastMessage(ChatColor.translateAlternateColorCodes('&', config.getString("Bot.mcsyntax")).replaceAll("\\{username}", e.getMember().getEffectiveName()).replaceAll("\\{message}", msg.replaceAll("§", "")));
     }
 }

src/main/java/de/tamion/minecraft/MCMain.java

@@ -2,17 +2,12 @@
 
 import de.tamion.discord.DCMain;
 import de.tamion.minecraft.commands.*;
-import de.tamion.others.Utils;
-import net.dv8tion.jda.api.EmbedBuilder;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.awt.*;
-
 public final class MCMain extends JavaPlugin {
 
     static MCMain plugin;
-
     @Override
     public void onEnable() {
         plugin = this;

src/main/java/de/tamion/minecraft/commands/SetGuildID.java

@@ -10,7 +10,7 @@
 public class SetGuildID implements CommandExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args) {
-        if(!sender.hasPermission("DCChat.id") && !sender.hasPermission("DCChat.admin")) {
+        if(!sender.hasPermission("DCChat.id")) {
             sender.sendMessage("You are not allowed to execute this Command!");
             return false;
         }

src/main/java/de/tamion/minecraft/commands/SetToken.java

@@ -10,7 +10,7 @@
 public class SetToken implements CommandExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args) {
-        if(!sender.hasPermission("DCChat.token") && !sender.hasPermission("DCChat.admin")) {
+        if(!sender.hasPermission("DCChat.token")) {
             sender.sendMessage("You are not allowed to execute this Command!");
             return false;
         }

src/main/java/de/tamion/minecraft/listeners/MCChat.java

@@ -3,13 +3,17 @@
 import de.tamion.minecraft.MCMain;
 import de.tamion.others.Utils;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChatEvent;
 
-public class Chat implements Listener {
+import java.util.HashMap;
+
+public class MCChat implements Listener {
      @EventHandler
      public void onChat(PlayerChatEvent e) {
+         Player p = e.getPlayer();
          FileConfiguration config = MCMain.getPlugin().getConfig();
          Utils.sendtochat(config.getString("Bot.dcsyntax").replaceAll("\\{username}", e.getPlayer().getName()).replaceAll("\\{message}", e.getMessage()));
      }

src/main/java/de/tamion/others/Utils.java

@@ -39,7 +39,7 @@ public static void sendtoconsole(MessageEmbed emb) {
         });
     }
     public static String setsyntax(CommandSender sender, String loc, String syntax) {
-        if(!sender.hasPermission("DCChat.syntax") && !sender.hasPermission("DCChat.admin")) {
+        if(!sender.hasPermission("DCChat.syntax")) {
             return "You are not allowed to execute this Command!";
         }
         MCMain.getPlugin().getConfig().set(loc, syntax);