Upgrade to 2.4.4

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.dadus33</groupId>
     <artifactId>chatitem</artifactId>
-    <version>2.4.3</version>
+    <version>2.4.4</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/me/dadus33/chatitem/chatmanager/ChatManager.java

@@ -103,7 +103,9 @@ public abstract class ChatManager {
 				
 				meta.setLore(lores);
 				item.setItemMeta(meta);
-			}
+				ChatItem.debug("Added " + addLore.size() + " lores from EcoEnchants");
+			} else
+				ChatItem.debug("No lore to add from EcoEnchants");
 		}
 		return item;
 	}

src/main/java/me/dadus33/chatitem/chatmanager/v1/PacketEditingChatManager.java

@@ -81,9 +81,12 @@ public class PacketEditingChatManager extends ChatManager {
 			if (cons.getParameterCount() == 2 && cons.getParameterTypes()[0].equals(String.class)
 					&& cons.getParameterTypes()[1].equals(int.class)) { // "string, int"
 				return cons.newInstance(json, 1);
-			} else if (cons.getParameterCount() == 3 && cons.getParameterTypes()[1].equals(String.class)
-					&& cons.getParameterTypes()[2].equals(int.class)) { // "component", "string", "int"
-				return cons.newInstance(null, json, 1);
+			} else if (cons.getParameterCount() == 3 && cons.getParameterTypes()[1].equals(String.class)) { // "component", "string", <something not checked>
+				Class<?> secondParam = cons.getParameterTypes()[2];
+				if(secondParam.equals(int.class)) // "component", "string", "int"
+					return cons.newInstance(null, json, 1);
+				else if(secondParam.equals(boolean.class)) // "component", "string", "boolean"
+					return cons.newInstance(null, json, false);
 			}
 		}
 		ChatItem.getInstance().getLogger()

src/main/java/me/dadus33/chatitem/chatmanager/v1/json/JSONManipulatorCurrent.java

@@ -78,6 +78,7 @@ public class JSONManipulatorCurrent {
 		if (!obj.has("text")) {
 			obj.addProperty("text", "");
 		}
+		ChatItem.debug("Parsed array for item: " + obj.toString());
 		return obj.toString();
 	}
 
@@ -234,8 +235,14 @@ public class JSONManipulatorCurrent {
 					sb.append(entry.getKey());
 				sb.append(":");
 			}
-			ChatItem.debug("Cleaning " + entry.getKey() + ": " + entry.getValue() + " > " + cleanStr(entry.getValue()));
-			sb.append(cleanStr(entry.getValue()));
+			if(entry.getKey().equalsIgnoreCase("display") && Version.getVersion().isNewerOrEquals(Version.V1_16)) {
+				String replaced = entry.getValue().replace("','", ",").replace("\"}',", "\"},");
+				ChatItem.debug("Cleaning display (custom): " + entry.getValue() + " > " + replaced);
+				sb.append(replaced);
+			} else {
+				ChatItem.debug("Cleaning " + entry.getKey() + ": " + entry.getValue() + " > " + cleanStr(entry.getValue()));
+				sb.append(cleanStr(entry.getValue()));
+			}
 		}
 		sb.append("}}"); // End of tag and end of item
 		return sb.toString();

src/main/java/me/dadus33/chatitem/chatmanager/v1/listeners/ChatPacketManager.java

@@ -75,6 +75,7 @@ public class ChatPacketManager extends PacketHandler {
 	public void onSend(ChatItemPacket e) {
 		if (!e.hasPlayer() || !e.getPacketType().equals(PacketType.Server.CHAT))
 			return;
+		ChatItem.debug("Checking: " + e.getPacketType().getFullName() + " > " + e.getPacket().getClass().getSimpleName());
 		if (lastSentPacket != null && lastSentPacket == e.getPacket())
 			return; // prevent infinite loop
 		PacketContent packet = e.getContent();
@@ -82,8 +83,10 @@ public class ChatPacketManager extends PacketHandler {
 		String json = "{}";
 		IBaseComponentGetter choosedGetter = null;
 		if (version.isNewerOrEquals(Version.V1_19)) {
-			if(packet.getIntegers().readSafely(0, 0) != 1)
+			if(packet.getIntegers().readSafely(0, 0) > 1) { // not parsed chat message type
+				ChatItem.debug("Invalid int: " + packet.getIntegers().read(0));
 				return;
+			}
 			choosedGetter = new StringComponentGetter();
 			json = choosedGetter.getBaseComponentAsJSON(e); // if null, will be re-checked so anyway
 		} else if (version.isNewerOrEquals(Version.V1_12)) {
@@ -110,8 +113,11 @@ public class ChatPacketManager extends PacketHandler {
 				}
 			}
 		}
-		if(json == null)
+		if(json == null || choosedGetter == null) {
+			ChatItem.debug("Can't find valid json getter or json itself");
+			ChatItem.debug("String: " + packet.getStrings().getContent());
 			return; // can't find something
+		}
 		String placeholder = choosedGetter.hasPlaceholders(getStorage(), json);
 		if (placeholder == null) {
 			ChatItem.debug("No placeholders founded in " + json);
@@ -178,23 +184,22 @@ public class ChatPacketManager extends PacketHandler {
 						PacketUtils.sendPacket(p, lastSentPacket);
 						return;
 					}
-					if (copy.getType().name().contains("_BOOK")) { // filtering written books
-						BookMeta bm = (BookMeta) copy.getItemMeta();
-						bm.setPages(Collections.emptyList());
-						copy.setItemMeta(bm);
-					} else {
-						if (copy.getType().name().contains("SHULKER_BOX")) { // if it's shulker
-							if (copy.hasItemMeta()) {
-								BlockStateMeta bsm = (BlockStateMeta) copy.getItemMeta();
-								if (bsm.hasBlockState()) {
-									ShulkerBox sb = (ShulkerBox) bsm.getBlockState();
-									for (ItemStack itemInv : sb.getInventory()) {
-										stripData(itemInv);
-									}
-									bsm.setBlockState(sb);
+					if(copy.hasItemMeta()) {
+						ItemMeta meta = copy.getItemMeta();
+						if (meta instanceof BookMeta) { // filtering written books
+							BookMeta bm = (BookMeta) copy.getItemMeta();
+							bm.setPages(Collections.emptyList());
+							copy.setItemMeta(bm);
+						} else if (meta instanceof BlockStateMeta && Version.getVersion().isNewerOrEquals(Version.V1_9)) { // if it's a block
+							BlockStateMeta bsm = (BlockStateMeta) copy.getItemMeta();
+							if (bsm.hasBlockState() && bsm.getBlockState() instanceof ShulkerBox) {
+								ShulkerBox sb = (ShulkerBox) bsm.getBlockState();
+								for (ItemStack itemInv : sb.getInventory()) {
+									stripData(itemInv);
 								}
-								copy.setItemMeta(bsm);
+								bsm.setBlockState(sb);
 							}
+							copy.setItemMeta(bsm);
 						}
 					}
 					message = manager.getManipulator().parse(localJson, copy,

src/main/java/me/dadus33/chatitem/chatmanager/v2/ChatListener.java

@@ -6,6 +6,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
 
+import javax.annotation.Nullable;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -31,7 +33,6 @@ import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.HoverEvent.Action;
 import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.chat.hover.content.Text;
 
 @SuppressWarnings("deprecation")
 public class ChatListener implements Listener {
@@ -242,10 +243,12 @@ public class ChatListener implements Listener {
 	public static void addItem(ComponentBuilder builder, Player to, Player origin, ItemStack item) {
 		Storage c = ChatItem.getInstance().getStorage();
 		if (!ItemUtils.isEmpty(item)) {
-			ComponentBuilder itemComponent = new ComponentBuilder(ChatManager.styleItem(to, item, c));
+			ComponentBuilder itemComponent = new ComponentBuilder("");
 			String itemJson = convertItemStackToJson(item);
+			BaseComponent[] itemBaseComponent = new ComponentBuilder(itemJson).create();
+			appendToComponentBuilder(itemComponent, fixColorComponent(ChatManager.getNameOfItem(to, item, c), ChatColor.WHITE, itemBaseComponent));
 			ChatItem.debug("Item for " + to.getName() + " (ver: " + ItemPlayer.getPlayer(to).getVersion().name() + ") : " + itemJson);
-			itemComponent.event(new HoverEvent(Action.SHOW_ITEM, new ComponentBuilder(itemJson).create()));
+			//itemComponent.event(new HoverEvent(Action.SHOW_ITEM, itemBaseComponent));
 			appendToComponentBuilder(builder, itemComponent.create());
 		} else {
 			String handName = c.HAND_NAME;
@@ -258,7 +261,7 @@ public class ChatListener implements Listener {
 				if (stay > 0)
 					handTooltip.append("\n");
 			}
-			handComp.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(handTooltip.create())));
+			handComp.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, handTooltip.create()));
 			if (handName.contains("{display-name}")) {
 				String[] splitted = handName.split("\\{display-name\\}");
 				for (int i = 0; i < (splitted.length - 1); i++) {
@@ -296,14 +299,22 @@ public class ChatListener implements Listener {
 	}
 
 	public static BaseComponent[] fixColorComponent(String message, ChatColor color) {
+		return fixColorComponent(message, color, null);
+	}
+	
+	public static BaseComponent[] fixColorComponent(String message, ChatColor color, @Nullable BaseComponent[] jsonItem) {
 		ComponentBuilder builder = new ComponentBuilder("");
 		String colorCode = "", text = "";
 		boolean waiting = false;
 		for (char args : message.toCharArray()) {
 			if (args == '§') { // begin of color
 				if (colorCode.isEmpty() && !text.isEmpty()) { // text before this char
-					ChatItem.debug("Append while fixing name " + text);
-					appendToComponentBuilder(builder, new ComponentBuilder(text).color(color).create());
+					ChatItem.debug("Append while fixing name " + (ColorManager.isHexColor(color) && builder.getParts().isEmpty() ? ColorManager.removeColorAtBegin(text) : text));
+					ComponentBuilder littleBuilder = new ComponentBuilder(ColorManager.isHexColor(color) ? ColorManager.removeColorAtBegin(text) : text).color(color);
+					if(jsonItem != null) { // add to all possible sub parts
+						littleBuilder.event(new HoverEvent(Action.SHOW_ITEM, jsonItem));
+					}
+					appendToComponentBuilder(builder, littleBuilder.create());
 					text = "";
 				}
 				waiting = true; // waiting for color code
@@ -334,14 +345,20 @@ public class ChatListener implements Listener {
 						color = ColorManager.getColor(colorCode);
 					else
 						text += ColorManager.getColorString(colorCode);
+					ChatItem.debug("Color: " + color + ", text: " + text + ", code: " + colorCode);
 					colorCode = "";
 				}
 				// basic text, not waiting for code after '§'
 				text += args;
 			}
 		}
-		if(!text.isEmpty())
-			appendToComponentBuilder(builder, new ComponentBuilder(text).color(color).create());
+		if(!text.isEmpty()) {
+			ComponentBuilder littleBuilder = new ComponentBuilder(text).color(color);
+			if(jsonItem != null) { // add to all possible sub parts
+				littleBuilder.event(new HoverEvent(Action.SHOW_ITEM, jsonItem));
+			}
+			appendToComponentBuilder(builder, littleBuilder.create());
+		}
 		return builder.create();
 	}
 }

src/main/java/me/dadus33/chatitem/commands/ChatItemCommand.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Locale;
 
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -45,7 +44,7 @@ public class ChatItemCommand implements CommandExecutor, TabExecutor {
 		} else if (args[0].equalsIgnoreCase("show")) {
 			Player cible = args.length == 1 ? p : Bukkit.getPlayer(args[1]);
 			if(cible == null) {
-				p.sendMessage(ChatColor.RED + "The player " + args[1] + " can't be found.");
+				Messages.sendMessage(p, "player-not-found", "%arg%", args[1]);
 				return false;
 			}
 			Storage c = ChatItem.getInstance().getStorage();
@@ -54,7 +53,7 @@ public class ChatItemCommand implements CommandExecutor, TabExecutor {
 		} else if (args[0].equalsIgnoreCase("broadcast")) {
 			Player cible = args.length == 1 ? p : Bukkit.getPlayer(args[1]);
 			if(cible == null) {
-				p.sendMessage(ChatColor.RED + "The player " + args[1] + " can't be found.");
+				Messages.sendMessage(p, "player-not-found", "%arg%", args[1]);
 				return false;
 			}
 			Storage c = ChatItem.getInstance().getStorage();

src/main/java/me/dadus33/chatitem/listeners/InventoryListener.java

@@ -50,6 +50,9 @@ public class InventoryListener implements Listener {
 		} else if(type.equals(Material.STICK)) {
 			setInConfig("general.hand.disabled", c.HAND_DISABLED = !c.HAND_DISABLED);
 			open(p);
+		} else if(type.equals(Material.BOOK)) {
+			setInConfig("general.check-update", c.CHECK_UPDATE = !c.CHECK_UPDATE);
+			open(p);
 		} else if(type.equals(ItemUtils.FIREWORK_CHARGE)) {
 			setInConfig("debug", c.DEBUG = !c.DEBUG);
 			open(p);
@@ -97,6 +100,7 @@ public class InventoryListener implements Listener {
 		inv.setItem(20, getBoolChangeItem(Material.STICK, "hand-disabled", c.HAND_DISABLED));
 		inv.setItem(21, getAmountChangeItem(Material.IRON_DOOR, "limit-per-message", c.LIMIT));
 		inv.setItem(22, getAmountChangeItem(Material.APPLE, "cooldown", c.COOLDOWN));
+		inv.setItem(23, getBoolChangeItem(Material.BOOK, "check-update", c.CHECK_UPDATE));
 		
 		inv.setItem(26, createItem(ItemUtils.MATERIAL_CLOSE, Messages.getMessage("admin-inv.close")));
 		p.openInventory(inv);

src/main/java/me/dadus33/chatitem/utils/ColorManager.java

@@ -1,15 +1,54 @@
 package me.dadus33.chatitem.utils;
 
+import java.util.Arrays;
+import java.util.List;
+
 import me.dadus33.chatitem.ChatItem;
 import net.md_5.bungee.api.ChatColor;
 
 public class ColorManager {
 
+	public static final List<String> COLORS = Arrays.asList("4", "c", "6", "e", "2", "a", "b", "3", "1", "9", "d", "5", "f", "7", "8", "0");
+	
+	public static boolean isHexColor(ChatColor c) {
+		return Version.getVersion().isNewerOrEquals(Version.V1_16) && c.getName().startsWith("#");
+	}
+	
+	public static boolean isHexColor(String c) {
+		return Version.getVersion().isNewerOrEquals(Version.V1_16) && c.startsWith("x");
+	}
+
+	public static String removeColorAtBegin(String s) {
+		if(s == null || s.isEmpty())
+			return "";
+		boolean wasColorChar = s.startsWith(Character.toString(ChatColor.COLOR_CHAR));
+		if(!wasColorChar)
+			return s;
+		String next = "";
+		for(int i = 1; i < s.length(); i++) {
+			char c = s.charAt(i);
+			if(wasColorChar) {
+				if(!COLORS.contains(Character.toString(c)))
+					next = next + ChatColor.COLOR_CHAR + "" + c;
+				wasColorChar = false;
+			} else {
+				wasColorChar = c == ChatColor.COLOR_CHAR;
+				if(!wasColorChar) { // something other than color code
+					next += s.substring(i);
+					break;
+				}
+			}
+		}
+		if(next.isEmpty())
+			next = s;
+		return next;
+	}
+	
 	public static String getColorString(String input) {
 		if (input == null || input.isEmpty())
 			return "";
 		StringBuilder str = new StringBuilder();
-		if (Version.getVersion().isNewerOrEquals(Version.V1_16) && input.startsWith("x")) { // x mean it's an hex
+		if (isHexColor(input)) { // x mean it's an hex
 			ChatItem.debug("Removing char x at begin: " + input.substring(1));
 			input = input.substring(1);
 			if (input.length() >= 6) { // at least hex
@@ -30,7 +69,7 @@ public class ColorManager {
 	public static ChatColor getColor(String input) {
 		if (input == null || input.isEmpty())
 			return ChatColor.RESET;
-		if (Version.getVersion().isNewerOrEquals(Version.V1_16) && input.startsWith("x")) { // x mean it's an hex
+		if (isHexColor(input)) { // x mean it's an hex
 			ChatItem.debug("Removing char x at begin: " + input.substring(1));
 			if (input.length() >= 7) { // at least hex, and 7 because we count the "x"
 				return ChatColor.of("#" + input.substring(1, 7)); // get first hex color code
@@ -57,12 +96,12 @@ public class ColorManager {
 				if (args == 'x' && !colorCode.isEmpty()) {
 					text += ColorManager.getColorString(colorCode);
 					colorCode = "x";
-				} else
+				} else if(Character.digit(Character.toLowerCase(args), 16) != -1)
 					colorCode += args; // a color by itself
 			} else {
 				waiting = false;
 				if (!colorCode.isEmpty()) {
-					if (colorCode.startsWith("x") && colorCode.length() >= 7) {
+					if (isHexColor(colorCode) && colorCode.length() >= 7) {
 						if (colorCode.length() == 7)
 							text += ColorManager.getColor(colorCode);
 						else {

src/main/java/me/dadus33/chatitem/utils/Utils.java

@@ -54,7 +54,7 @@ public class Utils {
 		ENCHANTS_NAMES.put("LURE", "Lure");
 		ENCHANTS_NAMES.put("MENDING", "Mending");
 		ENCHANTS_NAMES.put("OXYGEN", "Respiration");
-		ENCHANTS_NAMES.put("PROTECTION_ENVIRONMENTAL    ", "Protection");
+		ENCHANTS_NAMES.put("PROTECTION_ENVIRONMENTAL", "Protection");
 		ENCHANTS_NAMES.put("PROTECTION_EXPLOSIONS", "Blast Protection");
 		ENCHANTS_NAMES.put("PROTECTION_FALL", "Feather Falling");
 		ENCHANTS_NAMES.put("PROTECTION_FIRE", "Fire Protection");
@@ -82,7 +82,6 @@ public class Utils {
 	public static String getEnchantName(Enchantment enchant) {
 		String name = ENCHANTS_NAMES.get(enchant.getName());
 		if (name == null) {
-
 			ChatItem.getInstance().getLogger()
 					.warning("Unknown enchant " + enchant.getName() + ". Please report this to Elikill58.");
 		}

src/main/java/me/dadus33/chatitem/utils/Version.java

@@ -21,7 +21,7 @@ public enum Version {
 	V1_16(100, 700, 754),
 	V1_17(100, 755, 756),
 	V1_18(100, 757, 758),
-	V1_19(100, 759, 1000),
+	V1_19(100, 761, 1000),
 	HIGHER(Integer.MAX_VALUE, -1, Integer.MAX_VALUE);
 
 	// Latest version should always have the upper limit set to Integer.MAX_VALUE so

src/main/resources/config.yml

@@ -116,6 +116,8 @@ messages:
     hover: "&6Click to go to spigot page !"
   # For all commands ran by console by reserved to player
   only-players: "&cOnly players can run this command"
+  # The player is not found
+  player-not-found: "&cThe player %arg% can't be founded."
   # All messages for the /chatitem command
   chatitem-cmd:
     help:
@@ -161,6 +163,7 @@ messages:
     limit-per-message: "&6Limit per message: &a%state%"
     cooldown: "&6Cooldown: &a%state%"
     debug: "&6Debug: &a%state%"
+    check-update: "&6Check updates: &a%state%"
     # Change name and lore of all managers
     manager:
       both: