From 4ae4cb9f41e0cc79994f61f8ae9ec4d27b6272f4 Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Sat, 30 Sep 2017 10:54:13 +0200
Subject: [PATCH] Fix showing plugin tag for Paper

---
 .travis.yml                                           |  6 ++++--
 README.md                                             |  7 +++++++
 .../colorconsole/bukkit/ColorPluginAppender.java      | 11 +++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b16bd9..5036a34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ sudo: false
 # This is a java project
 language: java
 
-script: mvn compile test
+script: mvn test -B
 
-jdk: [oraclejdk8]
+jdk:
+  - oraclejdk8
+  - oraclejdk9
diff --git a/README.md b/README.md
index b5db952..e13063e 100644
--- a/README.md
+++ b/README.md
@@ -14,4 +14,11 @@ This lightweight plugin to make your console more colorful. It colorize the mess
 * Custom logFormat
 * Colorize plugin tags (customizable)
 * Easy to use config
+* Removes color from plugins if you want to
 * Supports all versions above 1.8+
+
+## Supports
+
+* BungeeCord/Waterfall
+* SpongeForge
+* Spigot/Paper
diff --git a/src/main/java/com/github/games647/colorconsole/bukkit/ColorPluginAppender.java b/src/main/java/com/github/games647/colorconsole/bukkit/ColorPluginAppender.java
index 78d9eaa..fe3c622 100644
--- a/src/main/java/com/github/games647/colorconsole/bukkit/ColorPluginAppender.java
+++ b/src/main/java/com/github/games647/colorconsole/bukkit/ColorPluginAppender.java
@@ -1,10 +1,12 @@
 package com.github.games647.colorconsole.bukkit;
 
 import com.github.games647.colorconsole.common.ColorAppender;
+import com.google.common.collect.Sets;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -18,6 +20,9 @@ import org.bukkit.plugin.Plugin;
 
 public class ColorPluginAppender extends ColorAppender {
 
+    private static final Set<String> disabledPrefix = Sets.newHashSet("net.minecraft", "Minecraft"
+            , "com.mojang", "com.sk89q", "ru.tehkode", "Minecraft.AWE");
+
     public ColorPluginAppender(Appender oldAppender, FileConfiguration config, Map<String, String> levelColors) {
         super(oldAppender
                 , config.getStringList("hide-messages")
@@ -29,6 +34,12 @@ public class ColorPluginAppender extends ColorAppender {
     @Override
     public LogEvent onAppend(LogEvent logEvent) {
         String oldMessage = logEvent.getMessage().getFormattedMessage();
+        String prefix = "[" + logEvent.getLoggerName() + "] ";
+        if (!oldMessage.contains(prefix)
+                && !disabledPrefix.stream().anyMatch(disabled -> logEvent.getLoggerName().startsWith(disabled))) {
+            oldMessage = prefix + oldMessage;
+        }
+
         Message newMessage = new SimpleMessage(formatter.colorizePluginTag(oldMessage, logEvent.getLevel().name()));
         return clone(logEvent, logEvent.getLoggerName(), newMessage);
     }