From 7f27bc5d38e74bae63fa5ba0f361ae132d0c855f Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sun, 3 Dec 2017 10:05:35 +0200 Subject: [PATCH] Placed WorldMap color to theme #443 --- Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java | 2 ++ .../main/java/com/djrapitops/plan/settings/theme/ThemeVal.java | 2 ++ Plan/src/main/resources/themes/greyscale.yml | 2 ++ Plan/src/main/resources/themes/mute.yml | 2 ++ Plan/src/main/resources/themes/pastel.yml | 2 ++ Plan/src/main/resources/themes/sepia.yml | 2 ++ Plan/src/main/resources/themes/soft.yml | 2 ++ Plan/src/main/resources/themes/theme.yml | 2 ++ Plan/src/main/resources/web/server.html | 2 +- 9 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java index 4afbd5727..0c15df24c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java @@ -78,6 +78,8 @@ public class AnalysisData extends RawData { addValue("tpsHighColor", Theme.getValue(ThemeVal.GRAPH_TPS_HIGH)); addValue("tpsMediumColor", Theme.getValue(ThemeVal.GRAPH_TPS_MED)); addValue("tpsLowColor", Theme.getValue(ThemeVal.GRAPH_TPS_LOW)); + addValue("worldMapColLow", Theme.getValue(ThemeVal.WORLD_MAP_LOW)); + addValue("worldMapColHigh", Theme.getValue(ThemeVal.WORLD_MAP_HIGH)); addValue("tpsMedium", Settings.THEME_GRAPH_TPS_THRESHOLD_MED.getNumber()); addValue("tpsHigh", Settings.THEME_GRAPH_TPS_THRESHOLD_HIGH.getNumber()); diff --git a/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.java b/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.java index 7f1ba8a7a..acfed148e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.java +++ b/Plan/src/main/java/com/djrapitops/plan/settings/theme/ThemeVal.java @@ -51,6 +51,8 @@ public enum ThemeVal { GRAPH_GM_PIE("GraphColors.GMDrilldown", "\"#438c99\", \"#639A67\", \"#D8EBB5\", \"#D9BF77\""), GRAPH_ACTIVITY_PIE("GraphColors.ActivityPie", "\"#4CAF50\", \"#8BC34A\", \"#CDDC39\", \"#FFC107\", \"#607D8B\""), GRAPH_SERVER_PREF_PIE("GraphColors.ServerPreferencePie", "\"#0099C6\", \"#66AA00\", \"#316395\", \"#994499\", \"#22AA99\", \"#AAAA11\", \"#6633CC\", \"#E67300\", \"#329262\", \"#5574A6\""), + WORLD_MAP_HIGH("GraphColors.WorldMap_High", "#267f00"), + WORLD_MAP_LOW("GraphColors.WorldMap_High", "#EEFFEE"), // PARSED_SESSION_ACCORDION("ParsedElements.SessionAccordion", "teal"), PARSED_SERVER_ACCORDION("ParsedElements.ServerAccordion", "light-green"); diff --git a/Plan/src/main/resources/themes/greyscale.yml b/Plan/src/main/resources/themes/greyscale.yml index 9eb0ac6af..554432ded 100644 --- a/Plan/src/main/resources/themes/greyscale.yml +++ b/Plan/src/main/resources/themes/greyscale.yml @@ -50,6 +50,8 @@ GraphColors: GMDrilldown: '"#535353", "#888888", "#6F6F6F", "#707070"' ActivityPie: '"#8C8C8C", "#A4A4A4", "#C4C4C4", "#BEBEBE", "#757575"' ServerPreferencePie: '"#707070", "#828282", "#595959", "#676767", "#7F7F7F", "#989898", "#535353", "#888888", "#6F6F6F", "#707070"' + WorldMap_High: "#555555" + WorldMap_Low: "#DDDDDD" # Leave blank "" for white ParsedElements: diff --git a/Plan/src/main/resources/themes/mute.yml b/Plan/src/main/resources/themes/mute.yml index c8cdc0a28..d42047da9 100644 --- a/Plan/src/main/resources/themes/mute.yml +++ b/Plan/src/main/resources/themes/mute.yml @@ -50,6 +50,8 @@ GraphColors: GMDrilldown: '"#865186", "#459A8F", "#A3A344", "#5F3F9E"' ActivityPie: '"#629F65", "#94B76C", "#CAD36E", "#E6C04C", "#687A83"' ServerPreferencePie: '"#2A89A5", "#709B31", "#0075FE", "#865186", "#459A8F", "#A3A344", "#5F3F9E", "#C27B33", "#4A8567", "#5F7291"' + WorldMap_High: "#386F21" + WorldMap_Low: "#EEFFEE" # Leave blank "" for white ParsedElements: diff --git a/Plan/src/main/resources/themes/pastel.yml b/Plan/src/main/resources/themes/pastel.yml index a454b8feb..3fe3172bc 100644 --- a/Plan/src/main/resources/themes/pastel.yml +++ b/Plan/src/main/resources/themes/pastel.yml @@ -50,6 +50,8 @@ GraphColors: GMDrilldown: '"#C9C900", "#8700FF", "#FF4E00", "#00CF4C"' ActivityPie: '"#00F600", "#5FF900", "#DDFF00", "#FFC600", "#3C8BB2"' ServerPreferencePie: '"#00E0FF", "#35EF00", "#0075FE", "#F007F0", "#00F5C6", "#C9C900", "#8700FF", "#FF4E00", "#00CF4C", "#267BFF"' + WorldMap_High: "#00C800" + WorldMap_Low: "#EEFFEE" # Leave blank "" for white ParsedElements: diff --git a/Plan/src/main/resources/themes/sepia.yml b/Plan/src/main/resources/themes/sepia.yml index c3bd95ef9..8a75bdc6d 100644 --- a/Plan/src/main/resources/themes/sepia.yml +++ b/Plan/src/main/resources/themes/sepia.yml @@ -50,6 +50,8 @@ GraphColors: GMDrilldown: '"#917F6E", "#A89889", "#675342", "#9A8877"' ActivityPie: '"#988675", "#B3A496", "#CEC4B9", "#C9BEB3", "#887564"' ServerPreferencePie: '"#84705F", "#948271", "#6D5948", "#7B6755", "#917F6E", "#A89889", "#675342", "#9A8877", "#836F5D", "#84705F"' + WorldMap_High: "#695544" + WorldMap_Low: "#FFFFFF" # Leave blank "" for white ParsedElements: diff --git a/Plan/src/main/resources/themes/soft.yml b/Plan/src/main/resources/themes/soft.yml index 38c40fdd5..97136e6f3 100644 --- a/Plan/src/main/resources/themes/soft.yml +++ b/Plan/src/main/resources/themes/soft.yml @@ -50,6 +50,8 @@ GraphColors: GMDrilldown: '"#8D3472", "#33A887", "#C5BC24", "#492176"' ActivityPie: '"#69B54C", "#BAD364", "#EFEF84", "#FFDF5C", "#617372"' ServerPreferencePie: '"#00869B", "#79AC00", "#25455D", "#8D3472", "#33A887", "#C5BC24", "#492176", "#EA7C00", "#307F4C", "#516681"' + WorldMap_High: "#267f00" + WorldMap_Low: "#EEFFEE" # Leave blank "" for white ParsedElements: diff --git a/Plan/src/main/resources/themes/theme.yml b/Plan/src/main/resources/themes/theme.yml index 98f650df2..21e331ca7 100644 --- a/Plan/src/main/resources/themes/theme.yml +++ b/Plan/src/main/resources/themes/theme.yml @@ -50,6 +50,8 @@ GraphColors: GMDrilldown: '"#438c99", "#639A67", "#D8EBB5", "#D9BF77"' ActivityPie: '"#4CAF50", "#8BC34A", "#CDDC39", "#FFC107", "#607D8B"' ServerPreferencePie: '"#0099C6", "#66AA00", "#316395", "#994499", "#22AA99", "#AAAA11", "#6633CC", "#E67300", "#329262", "#5574A6"' + WorldMap_High: "#267f00" + WorldMap_Low: "#EEFFEE" # Leave blank "" for white ParsedElements: diff --git a/Plan/src/main/resources/web/server.html b/Plan/src/main/resources/web/server.html index adfcdf71d..eaba8be23 100644 --- a/Plan/src/main/resources/web/server.html +++ b/Plan/src/main/resources/web/server.html @@ -1086,7 +1086,7 @@ tpsChart('tpsGraph', tpsSeries, playersOnlineSeries); resourceChart('resourceGraph', cpuSeries, ramSeries, playersOnlineSeries); worldChart('worldGraph', entitySeries, chunkSeries, playersOnlineSeries); - worldMap('worldMap', '#EEFFEE', '#267f00', mapSeries); + worldMap('worldMap', '${worldMapColLow}', '${worldMapColHigh}', mapSeries); punchCard('punchCard', punchcardSeries); healthGauge('healthGauge', [${healthIndex}]); ${sessionTabGraphViewFunctions}