From a88f1313e3b1eae9dee07fd41616c5a00f8c0888 Mon Sep 17 00:00:00 2001 From: Luke Bingham Date: Fri, 16 Apr 2021 23:06:16 +0100 Subject: [PATCH] 1.16 supports RGB https://imgur.com/NfUmFMl --- .../bobacadodl/imgmessage/ImageMessage.java | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/bobacadodl/imgmessage/ImageMessage.java b/src/main/java/com/bobacadodl/imgmessage/ImageMessage.java index 22a41f4..d51f27c 100644 --- a/src/main/java/com/bobacadodl/imgmessage/ImageMessage.java +++ b/src/main/java/com/bobacadodl/imgmessage/ImageMessage.java @@ -1,6 +1,6 @@ package com.bobacadodl.imgmessage; -import org.bukkit.ChatColor; +import net.md_5.bungee.api.ChatColor; import org.bukkit.entity.Player; import org.bukkit.util.ChatPaginator; @@ -132,26 +132,27 @@ private boolean areIdentical(Color c1, Color c2) { private ChatColor getClosestChatColor(Color color) { if (color.getAlpha() < 128) return null; - - int index = 0; - double best = -1; - - for (int i = 0; i < colors.length; i++) { - if (areIdentical(colors[i], color)) { - return ChatColor.values()[i]; - } - } - - for (int i = 0; i < colors.length; i++) { - double distance = getDistance(color, colors[i]); - if (distance < best || best == -1) { - best = distance; - index = i; - } - } - - // Minecraft has 15 colors - return ChatColor.values()[index]; + return ChatColor.of(color); +// +// int index = 0; +// double best = -1; +// +// for (int i = 0; i < colors.length; i++) { +// if (areIdentical(colors[i], color)) { +// return ChatColor.values()[i]; +// } +// } +// +// for (int i = 0; i < colors.length; i++) { +// double distance = getDistance(color, colors[i]); +// if (distance < best || best == -1) { +// best = distance; +// index = i; +// } +// } +// +// // Minecraft has 15 colors +// return ChatColor.values()[index]; } private String center(String s, int length) {