Spigot / Bukkit / 78af97dbe30

Commits

Thinkofname authored 78af97dbe30 07 Mar 2015

SPIGOT-652: Update the map colors to match Minecraft

src/main/java/org/bukkit/map/MapPalette.java

Modified


23 23	double rmean = (c1.getRed() + c2.getRed()) / 2.0;
24 24	double r = c1.getRed() - c2.getRed();
25 25	double g = c1.getGreen() - c2.getGreen();
26 26	int b = c1.getBlue() - c2.getBlue();
27 27	double weightR = 2 + rmean / 256.0;
28 28	double weightG = 4.0;
29 29	double weightB = 2 + (255 - rmean) / 256.0;
30 30	return weightR * r * r + weightG * g * g + weightB * b * b;
31 31	}
32 32
33 -	private static final Color[] colors = {
34 -	new Color(0, 0, 0, 0), new Color(0, 0, 0, 0),
35 -	new Color(0, 0, 0, 0), new Color(0, 0, 0, 0),
33 +	static final Color[] colors = {
34 +	c(0, 0, 0), c(0, 0, 0), c(0, 0, 0), c(0, 0, 0),
36 35	c(89, 125, 39), c(109, 153, 48), c(127, 178, 56), c(67, 94, 29),
37 36	c(174, 164, 115), c(213, 201, 140), c(247, 233, 163), c(130, 123, 86),
38 -	c(117, 117, 117), c(144, 144, 144), c(167, 167, 167), c(88, 88, 88),
37 +	c(140, 140, 140), c(171, 171, 171), c(199, 199, 199), c(105, 105, 105),
39 38	c(180, 0, 0), c(220, 0, 0), c(255, 0, 0), c(135, 0, 0),
40 39	c(112, 112, 180), c(138, 138, 220), c(160, 160, 255), c(84, 84, 135),
41 40	c(117, 117, 117), c(144, 144, 144), c(167, 167, 167), c(88, 88, 88),
42 41	c(0, 87, 0), c(0, 106, 0), c(0, 124, 0), c(0, 65, 0),
43 42	c(180, 180, 180), c(220, 220, 220), c(255, 255, 255), c(135, 135, 135),
44 43	c(115, 118, 129), c(141, 144, 158), c(164, 168, 184), c(86, 88, 97),
45 -	c(129, 74, 33), c(157, 91, 40), c(183, 106, 47), c(96, 56, 24),
44 +	c(106, 76, 54), c(130, 94, 66), c(151, 109, 77), c(79, 57, 40),
46 45	c(79, 79, 79), c(96, 96, 96), c(112, 112, 112), c(59, 59, 59),
47 46	c(45, 45, 180), c(55, 55, 220), c(64, 64, 255), c(33, 33, 135),
48 -	c(73, 58, 35), c(89, 71, 43), c(104, 83, 50), c(55, 43, 26),
47 +	c(100, 84, 50), c(123, 102, 62), c(143, 119, 72), c(75, 63, 38),
49 48	c(180, 177, 172), c(220, 217, 211), c(255, 252, 245), c(135, 133, 129),
50 49	c(152, 89, 36), c(186, 109, 44), c(216, 127, 51), c(114, 67, 27),
51 50	c(125, 53, 152), c(153, 65, 186), c(178, 76, 216), c(94, 40, 114),
52 51	c(72, 108, 152), c(88, 132, 186), c(102, 153, 216), c(54, 81, 114),
53 52	c(161, 161, 36), c(197, 197, 44), c(229, 229, 51), c(121, 121, 27),
54 53	c(89, 144, 17), c(109, 176, 21), c(127, 204, 25), c(67, 108, 13),
55 54	c(170, 89, 116), c(208, 109, 142), c(242, 127, 165), c(128, 67, 87),
56 55	c(53, 53, 53), c(65, 65, 65), c(76, 76, 76), c(40, 40, 40),
57 56	c(108, 108, 108), c(132, 132, 132), c(153, 153, 153), c(81, 81, 81),
58 57	c(53, 89, 108), c(65, 109, 132), c(76, 127, 153), c(40, 67, 81),
59 58	c(89, 44, 125), c(109, 54, 153), c(127, 63, 178), c(67, 33, 94),
60 59	c(36, 53, 125), c(44, 65, 153), c(51, 76, 178), c(27, 40, 94),
61 60	c(72, 53, 36), c(88, 65, 44), c(102, 76, 51), c(54, 40, 27),
62 61	c(72, 89, 36), c(88, 109, 44), c(102, 127, 51), c(54, 67, 27),
63 62	c(108, 36, 36), c(132, 44, 44), c(153, 51, 51), c(81, 27, 27),
64 63	c(17, 17, 17), c(21, 21, 21), c(25, 25, 25), c(13, 13, 13),
65 64	c(176, 168, 54), c(215, 205, 66), c(250, 238, 77), c(132, 126, 40),
66 65	c(64, 154, 150), c(79, 188, 183), c(92, 219, 213), c(48, 115, 112),
67 66	c(52, 90, 180), c(63, 110, 220), c(74, 128, 255), c(39, 67, 135),
68 67	c(0, 153, 40), c(0, 187, 50), c(0, 217, 58), c(0, 114, 30),
69 -	c(14, 14, 21), c(18, 17, 26), c(21, 20, 31), c(11, 10, 16),
70 -	c(79, 1, 0), c(96, 1, 0), c(112, 2, 0), c(59, 1, 0)
68 +	c(91, 60, 34), c(111, 74, 42), c(129, 86, 49), c(68, 45, 25),
69 +	c(79, 1, 0), c(96, 1, 0), c(112, 2, 0), c(59, 1, 0),
71 70	};
72 71
73 72	// Interface
74 73	/**
75 74	* @deprecated Magic value
76 75	*/
77 76	@Deprecated
78 77	public static final byte TRANSPARENT = 0;
79 78	/**
80 79	* @deprecated Magic value

Bukkit

Commits

Jira Issues

Add shortcut