From 6ece65130dbe2b3956d8b723db004cf0f07bf21e Mon Sep 17 00:00:00 2001 From: games647 Date: Sun, 29 Jul 2018 18:33:21 +0200 Subject: [PATCH] Improve compatibility with Paper --- .gitignore | 50 ++++++++++--------- LICENSE | 2 +- README.md | 2 +- pom.xml | 11 ++-- .../bukkit/ColorPluginAppender.java | 12 ++++- .../bungee/ColorLogFormatter.java | 4 +- .../colorconsole/common/ColorAppender.java | 3 +- .../colorconsole/common/CommonFormatter.java | 2 +- .../sponge/ColorPluginAppender.java | 4 +- 9 files changed, 49 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 60893af..594dbe9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,22 @@ -# Eclipse stuff -/.classpath -/.project -/.settings +# Eclipse +.classpath +.project +.settings/ # NetBeans -*/nbproject +nbproject/ nb-configuration.xml -# maven -*/target - -# vim -.*.sw[a-p] - -# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -# various other potential build files -*/build/ -/bin -/dist -/manifest.mf -*.log - -# Mac filesystem dust -.DS_Store - # IntelliJ *.iml *.ipr *.iws .idea/ +# Maven +target/ +pom.xml.versionsBackup + # Gradle .gradle @@ -40,3 +25,20 @@ gradle-app.setting # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar + +# various other potential build files +build/ +bin/ +dist/ +manifest.mf +*.log + +# Vim +.*.sw[a-p] + +# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# Mac filesystem dust +.DS_Store + diff --git a/LICENSE b/LICENSE index d14a2a5..4b52f2c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 +Copyright (c) 2016-2018 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 761a564..f5aa956 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ overview about what's happening on your server. * Colorize plugin tags (customizable) * Easy to use config * Removes color from plugins if you want to -* Supports all versions above 1.8+ +* Supports all versions above 1.8.8+ ## Supports diff --git a/pom.xml b/pom.xml index cce5212..3361079 100644 --- a/pom.xml +++ b/pom.xml @@ -31,15 +31,10 @@ org.apache.maven.plugins maven-shade-plugin - 3.0.0 + 3.1.0 false true - - - org.fusesource.jansi:jansi - - org.fusesource.jansi:jansi @@ -124,14 +119,14 @@ org.spongepowered spongeapi - 6.0.0 + 7.0.0 provided org.fusesource.jansi jansi - 1.16 + 1.17 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 02a1d49..fd25aec 100644 --- a/src/main/java/com/github/games647/colorconsole/bukkit/ColorPluginAppender.java +++ b/src/main/java/com/github/games647/colorconsole/bukkit/ColorPluginAppender.java @@ -18,24 +18,32 @@ import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.plugin.Plugin; +import static java.util.stream.Collectors.toSet; + public class ColorPluginAppender extends ColorAppender { private static final Set disabledPrefix = Sets.newHashSet("net.minecraft", "Minecraft" , "com.mojang", "com.sk89q", "ru.tehkode", "Minecraft.AWE"); + private final boolean isVanillaAppender; + public ColorPluginAppender(Appender oldAppender, ConfigurationSection config, Map levelColors) { super(oldAppender , config.getStringList("hide-messages") , config.getBoolean("colorPluginTag") , config.getBoolean("truncateColor") , config.getBoolean("colorMessage") ? levelColors : Collections.emptyMap()); + + this.isVanillaAppender = "QueueLogAppender".equals(oldAppender.getClass().getSimpleName()); } @Override public LogEvent onAppend(LogEvent logEvent) { String oldMessage = logEvent.getMessage().getFormattedMessage(); String prefix = '[' + logEvent.getLoggerName() + "] "; - if (!oldMessage.contains(prefix) + + //PaperSpigot append prefix + if (!isVanillaAppender && disabledPrefix.stream().noneMatch(disabled -> logEvent.getLoggerName().startsWith(disabled))) { oldMessage = prefix + oldMessage; } @@ -48,6 +56,6 @@ public class ColorPluginAppender extends ColorAppender { protected Collection loadPluginNames() { return Stream.of(Bukkit.getPluginManager().getPlugins()) .map(Plugin::getName) - .collect(Collectors.toSet()); + .collect(toSet()); } } diff --git a/src/main/java/com/github/games647/colorconsole/bungee/ColorLogFormatter.java b/src/main/java/com/github/games647/colorconsole/bungee/ColorLogFormatter.java index 5c25a80..4db8b70 100644 --- a/src/main/java/com/github/games647/colorconsole/bungee/ColorLogFormatter.java +++ b/src/main/java/com/github/games647/colorconsole/bungee/ColorLogFormatter.java @@ -17,6 +17,8 @@ import java.util.stream.Collectors; import net.md_5.bungee.api.ProxyServer; +import static java.util.stream.Collectors.toSet; + public class ColorLogFormatter extends Formatter { private final ColorConsoleBungee plugin; @@ -103,7 +105,7 @@ public class ColorLogFormatter extends Formatter { private Set loadPluginNames() { return ProxyServer.getInstance().getPluginManager().getPlugins().stream() .map(plugin -> plugin.getDescription().getName()) - .collect(Collectors.toSet()); + .collect(toSet()); } public void initPluginColors(String def) { diff --git a/src/main/java/com/github/games647/colorconsole/common/ColorAppender.java b/src/main/java/com/github/games647/colorconsole/common/ColorAppender.java index 921986d..86d8f99 100644 --- a/src/main/java/com/github/games647/colorconsole/common/ColorAppender.java +++ b/src/main/java/com/github/games647/colorconsole/common/ColorAppender.java @@ -30,8 +30,7 @@ public abstract class ColorAppender extends AbstractAppender { loggerClassGetter = classGetter; } - private final Appender oldAppender; - + protected final Appender oldAppender; protected final CommonFormatter formatter; protected ColorAppender(Appender oldAppender, Collection hideMessages diff --git a/src/main/java/com/github/games647/colorconsole/common/CommonFormatter.java b/src/main/java/com/github/games647/colorconsole/common/CommonFormatter.java index b0bf84b..00de205 100644 --- a/src/main/java/com/github/games647/colorconsole/common/CommonFormatter.java +++ b/src/main/java/com/github/games647/colorconsole/common/CommonFormatter.java @@ -18,7 +18,7 @@ import org.fusesource.jansi.AnsiRenderer.Code; public class CommonFormatter { - //copied from AnsiEscape in order to provide compatibility with older minecraft versions + //copied from AnsiEscape in order to provide compatibility with older Minecraft versions private static final String CSI = "\u001b["; private static final char SUFFIX = 'm'; private final String reset = Ansi.ansi().a(Ansi.Attribute.RESET).toString(); diff --git a/src/main/java/com/github/games647/colorconsole/sponge/ColorPluginAppender.java b/src/main/java/com/github/games647/colorconsole/sponge/ColorPluginAppender.java index bae34ac..e11c688 100644 --- a/src/main/java/com/github/games647/colorconsole/sponge/ColorPluginAppender.java +++ b/src/main/java/com/github/games647/colorconsole/sponge/ColorPluginAppender.java @@ -11,6 +11,8 @@ import org.apache.logging.log4j.core.LogEvent; import org.spongepowered.api.Sponge; import org.spongepowered.api.plugin.PluginContainer; +import static java.util.stream.Collectors.toSet; + public class ColorPluginAppender extends ColorAppender { public ColorPluginAppender(Appender oldAppender, ColorConsoleConfig config) { @@ -28,6 +30,6 @@ public class ColorPluginAppender extends ColorAppender { protected Collection loadPluginNames() { return Sponge.getPluginManager().getPlugins().stream() .map(PluginContainer::getId) - .collect(Collectors.toSet()); + .collect(toSet()); } }