From 78af97dbe303df77eb9443074ee0494cd80e0ac9 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 7 Mar 2015 12:57:14 +0000 Subject: SPIGOT-652: Update the map colors to match Minecraft --- src/main/java/org/bukkit/map/MapPalette.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java index 35f3e19b..3aca081d 100644 --- a/src/main/java/org/bukkit/map/MapPalette.java +++ b/src/main/java/org/bukkit/map/MapPalette.java @@ -30,22 +30,21 @@ public final class MapPalette { return weightR * r * r + weightG * g * g + weightB * b * b; } - private static final Color[] colors = { - new Color(0, 0, 0, 0), new Color(0, 0, 0, 0), - new Color(0, 0, 0, 0), new Color(0, 0, 0, 0), + static final Color[] colors = { + c(0, 0, 0), c(0, 0, 0), c(0, 0, 0), c(0, 0, 0), c(89, 125, 39), c(109, 153, 48), c(127, 178, 56), c(67, 94, 29), c(174, 164, 115), c(213, 201, 140), c(247, 233, 163), c(130, 123, 86), - c(117, 117, 117), c(144, 144, 144), c(167, 167, 167), c(88, 88, 88), + c(140, 140, 140), c(171, 171, 171), c(199, 199, 199), c(105, 105, 105), c(180, 0, 0), c(220, 0, 0), c(255, 0, 0), c(135, 0, 0), c(112, 112, 180), c(138, 138, 220), c(160, 160, 255), c(84, 84, 135), c(117, 117, 117), c(144, 144, 144), c(167, 167, 167), c(88, 88, 88), c(0, 87, 0), c(0, 106, 0), c(0, 124, 0), c(0, 65, 0), c(180, 180, 180), c(220, 220, 220), c(255, 255, 255), c(135, 135, 135), c(115, 118, 129), c(141, 144, 158), c(164, 168, 184), c(86, 88, 97), - c(129, 74, 33), c(157, 91, 40), c(183, 106, 47), c(96, 56, 24), + c(106, 76, 54), c(130, 94, 66), c(151, 109, 77), c(79, 57, 40), c(79, 79, 79), c(96, 96, 96), c(112, 112, 112), c(59, 59, 59), c(45, 45, 180), c(55, 55, 220), c(64, 64, 255), c(33, 33, 135), - c(73, 58, 35), c(89, 71, 43), c(104, 83, 50), c(55, 43, 26), + c(100, 84, 50), c(123, 102, 62), c(143, 119, 72), c(75, 63, 38), c(180, 177, 172), c(220, 217, 211), c(255, 252, 245), c(135, 133, 129), c(152, 89, 36), c(186, 109, 44), c(216, 127, 51), c(114, 67, 27), c(125, 53, 152), c(153, 65, 186), c(178, 76, 216), c(94, 40, 114), @@ -66,8 +65,8 @@ public final class MapPalette { c(64, 154, 150), c(79, 188, 183), c(92, 219, 213), c(48, 115, 112), c(52, 90, 180), c(63, 110, 220), c(74, 128, 255), c(39, 67, 135), c(0, 153, 40), c(0, 187, 50), c(0, 217, 58), c(0, 114, 30), - c(14, 14, 21), c(18, 17, 26), c(21, 20, 31), c(11, 10, 16), - c(79, 1, 0), c(96, 1, 0), c(112, 2, 0), c(59, 1, 0) + c(91, 60, 34), c(111, 74, 42), c(129, 86, 49), c(68, 45, 25), + c(79, 1, 0), c(96, 1, 0), c(112, 2, 0), c(59, 1, 0), }; // Interface -- cgit v1.2.3