Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-07-23 20:55:05 +02:00
Code Issues Projects Releases Wiki Activity

Fixed player nicknames not getting colors translated

Browse Source
This commit is contained in:
Rsl1122 2019-08-25 11:13:51 +03:00
parent bb422df600
commit 63434cc8e0
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/common/src/main/java/com/djrapitops/plan/system/json/PlayerJSONParser.java
View File

@ -33,9 +33,11 @@ import com.djrapitops.plan.system.settings.theme.Theme;
import com.djrapitops.plan.system.settings.theme.ThemeVal;
import com.djrapitops.plan.utilities.formatting.Formatter;
import com.djrapitops.plan.utilities.formatting.Formatters;
import com.djrapitops.plan.utilities.html.Html;
import com.djrapitops.plan.utilities.html.graphs.Graphs;
import com.djrapitops.plan.utilities.html.graphs.pie.WorldPie;
import com.djrapitops.plan.utilities.html.structure.ServerAccordion;
import org.apache.commons.text.StringEscapeUtils;
import javax.inject.Inject;
import javax.inject.Singleton;
@ -275,7 +277,7 @@ public class PlayerJSONParser {
List<Nickname> mapped = new ArrayList<>();
for (com.djrapitops.plan.data.store.objects.Nickname nickname : nicknames) {
mapped.add(new Nickname(
nickname.getName(),
Html.swapColorCodesToSpan(StringEscapeUtils.escapeHtml4(nickname.getName())),
serverNames.getOrDefault(nickname.getServerUUID(), nickname.getServerUUID().toString()),
dateFormatter.apply(nickname.getDate())
));

67
Plan/common/src/main/resources/assets/plan/web/css/style.css
View File

@ -956,4 +956,71 @@ div.scrollbar {
.col-plan {
color: #368F17;
}
/* Minecraft color codes */
.black {
color: #000000;
}
.darkblue {
color: #0000AA;
}
.darkgreen {
color: #00AA00;
}
.darkaqua {
color: #00AAAA;
}
.darkred {
color: #AA0000;
}
.darkpurple {
color: #AA00AA;
}
.gold {
color: #FFAA00;
}
.gray {
color: #AAAAAA;
}
.darkgray {
color: #555555;
}
.blue {
color: #5555FF;
}
.green {
color: #55FF55;
}
.aqua {
color: #55FFFF;
}
.red {
color: #FF5555;
}
.pink {
color: #FF55FF;
}
.yellow {
color: #FFFF55;
text-shadow: 0 0 6px #000;
}
.white {
color: #FFFFFF;
text-shadow: 0 0 8px #000;
}