diff --git a/src/com/massivecraft/massivecore/MassiveCoreMConf.java b/src/com/massivecraft/massivecore/MassiveCoreMConf.java index 5b86a5d2..523baef3 100644 --- a/src/com/massivecraft/massivecore/MassiveCoreMConf.java +++ b/src/com/massivecraft/massivecore/MassiveCoreMConf.java @@ -46,6 +46,7 @@ public class MassiveCoreMConf extends Entity public boolean versionSynchronizationEnabled = true; public int tabCompletionLimit = 100; public boolean recipientChatEventEnabled = true; + public boolean consoleColorsEnabled = true; // -------------------------------------------- // // PERMISSIONS FORMATS @@ -142,9 +143,7 @@ public class MassiveCoreMConf extends Entity // DEVELOPER // -------------------------------------------- // - public boolean debugWriters = false; - public boolean debugActives = false; - public boolean testsEnabled = false; + public boolean debugEnabled = false; // -------------------------------------------- // // SPONSOR diff --git a/src/com/massivecraft/massivecore/MassivePlugin.java b/src/com/massivecraft/massivecore/MassivePlugin.java index e6919058..86895b8c 100644 --- a/src/com/massivecraft/massivecore/MassivePlugin.java +++ b/src/com/massivecraft/massivecore/MassivePlugin.java @@ -3,6 +3,7 @@ package com.massivecraft.massivecore; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.mixin.Mixin; +import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.predicate.PredicateAnd; import com.massivecraft.massivecore.predicate.PredicateIsClassSingleton; @@ -216,7 +217,7 @@ public abstract class MassivePlugin extends JavaPlugin implements Listener, Name // can only happen after others have been initialised. public void activateOne(Object object) { - boolean debug = MassiveCoreMConf.get() != null && MassiveCoreMConf.get().debugActives; + boolean debug = MassiveCoreMConf.get() != null && MassiveCoreMConf.get().debugEnabled; // Try collection if (object instanceof Iterable) @@ -460,14 +461,15 @@ public abstract class MassivePlugin extends JavaPlugin implements Listener, Name public void log(Level level, Object... msg) { String imploded = Txt.implode(msg, " "); - ConsoleCommandSender sender = Bukkit.getConsoleSender(); - if (level == Level.INFO && sender != null) + ConsoleCommandSender console = Bukkit.getConsoleSender(); + if (level == Level.INFO && console != null) { - Bukkit.getConsoleSender().sendMessage(this.logPrefixColored + imploded); + MixinMessage.get().messageOne(console, this.logPrefixColored + imploded); } else { Logger.getLogger("Minecraft").log(level, this.logPrefixPlain + imploded); } } + } diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java index b6948068..f8945662 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java @@ -9,6 +9,7 @@ import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerRespawn; import com.massivecraft.massivecore.event.EventMassiveCoreAfterPlayerTeleport; import com.massivecraft.massivecore.event.EventMassiveCorePermissionDeniedFormat; import com.massivecraft.massivecore.event.EventMassiveCorePlayerToRecipientChat; +import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.mixin.MixinVisibility; import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase; @@ -78,7 +79,7 @@ public class EngineMassiveCoreMain extends Engine // Format and send with the format and message from this recipient's own event. String recipientMessage = String.format(recipientEvent.getFormat(), sender.getDisplayName(), recipientEvent.getMessage()); - recipient.sendMessage(recipientMessage); + MixinMessage.get().messageOne(recipient, recipientMessage); } // For the console diff --git a/src/com/massivecraft/massivecore/item/WriterAbstract.java b/src/com/massivecraft/massivecore/item/WriterAbstract.java index 103f7b5e..2425cb21 100644 --- a/src/com/massivecraft/massivecore/item/WriterAbstract.java +++ b/src/com/massivecraft/massivecore/item/WriterAbstract.java @@ -105,7 +105,7 @@ public abstract class WriterAbstract extends Engine public void reportSuccess(boolean success, String name, Throwable t) { - if ( ! MassiveCoreMConf.get().debugWriters) return; + if ( ! MassiveCoreMConf.get().debugEnabled) return; // Create List messages = new MassiveList<>(); diff --git a/src/com/massivecraft/massivecore/mixin/MixinMessage.java b/src/com/massivecraft/massivecore/mixin/MixinMessage.java index 5bc564c6..8f3c5b4f 100644 --- a/src/com/massivecraft/massivecore/mixin/MixinMessage.java +++ b/src/com/massivecraft/massivecore/mixin/MixinMessage.java @@ -171,8 +171,8 @@ public class MixinMessage extends Mixin { if (message instanceof String) { - String string = (String)message; - sendee.sendMessage(string); + String plain = (String)message; + NmsChat.get().sendChatPlain(sendee, plain); } else if (message instanceof Mson) { diff --git a/src/com/massivecraft/massivecore/nms/NmsChat.java b/src/com/massivecraft/massivecore/nms/NmsChat.java index 778a26c2..8e82a63c 100644 --- a/src/com/massivecraft/massivecore/nms/NmsChat.java +++ b/src/com/massivecraft/massivecore/nms/NmsChat.java @@ -1,10 +1,13 @@ package com.massivecraft.massivecore.nms; +import com.massivecraft.massivecore.MassiveCoreMConf; import com.massivecraft.massivecore.mixin.Mixin; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.Txt; +import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; import org.json.simple.JSONObject; public class NmsChat extends Mixin @@ -36,8 +39,20 @@ public class NmsChat extends Mixin CommandSender sendee = IdUtil.getSender(sendeeObject); if (sendee == null) return; - String message = mson.toPlain(true); - sendee.sendMessage(message); + String plain = mson.toPlain(true); + sendChatPlain(sendee, plain); + } + + public void sendChatPlain(Object sendeeObject, String plain) { + CommandSender sendee = IdUtil.getSender(sendeeObject); + if (sendee == null) return; + + MassiveCoreMConf mconf = MassiveCoreMConf.get(); + if (mconf != null && !mconf.consoleColorsEnabled && sendee instanceof ConsoleCommandSender) { + plain = ChatColor.stripColor(plain); + } + + sendee.sendMessage(plain); } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/nms/NmsChatAbstract.java b/src/com/massivecraft/massivecore/nms/NmsChatAbstract.java index c55a48c4..3a05a6d8 100644 --- a/src/com/massivecraft/massivecore/nms/NmsChatAbstract.java +++ b/src/com/massivecraft/massivecore/nms/NmsChatAbstract.java @@ -119,8 +119,8 @@ public abstract class NmsChatAbstract extends NmsChat } else { - String message = mson.toPlain(true); - sendee.sendMessage(message); + String plain = mson.toPlain(true); + this.sendChatPlain(sendee, plain); } } diff --git a/src/com/massivecraft/massivecore/test/Test.java b/src/com/massivecraft/massivecore/test/Test.java index d183b5a3..87a56472 100644 --- a/src/com/massivecraft/massivecore/test/Test.java +++ b/src/com/massivecraft/massivecore/test/Test.java @@ -29,7 +29,7 @@ public abstract class Test extends Engine @Override public void setActiveInner(boolean active) { - if (!MassiveCoreMConf.get().testsEnabled) return; + if (!MassiveCoreMConf.get().debugEnabled) return; this.test(); diff --git a/src/com/massivecraft/massivecore/util/PermissionUtil.java b/src/com/massivecraft/massivecore/util/PermissionUtil.java index 1e2e4247..4b167df8 100644 --- a/src/com/massivecraft/massivecore/util/PermissionUtil.java +++ b/src/com/massivecraft/massivecore/util/PermissionUtil.java @@ -4,6 +4,7 @@ import com.massivecraft.massivecore.Identified; import com.massivecraft.massivecore.Lang; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.event.EventMassiveCorePermissionDeniedFormat; +import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.nms.NmsPermissions; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -390,7 +391,7 @@ public class PermissionUtil { CommandSender sender = (CommandSender)permissible; String message = getPermissionDeniedMessage(permission); - sender.sendMessage(message); + MixinMessage.get().messageOne(sender, message); } return false;