Upgrade to 2.4.2

pom.xml

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

src/main/java/me/dadus33/chatitem/ChatItem.java

@@ -56,7 +56,7 @@ public class ChatItem extends JavaPlugin {
 
     public static void debug(String msg) {
         if (getInstance().getStorage().DEBUG)
-            getInstance().getLogger().info("[Debug] " + msg);
+            getInstance().getLogger().info("[Debug] " + msg.replace(ChatManager.SEPARATOR, 'S'));
     }
 
     private void chooseManagers() {

src/main/java/me/dadus33/chatitem/ItemPlayer.java

@@ -1,7 +1,7 @@
 package me.dadus33.chatitem;
 
-import java.util.HashMap;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -11,7 +11,7 @@ import me.dadus33.chatitem.utils.Version;
 
 public class ItemPlayer {
 
-	private static final HashMap<UUID, ItemPlayer> PLAYERS = new HashMap<>();
+	private static final ConcurrentHashMap<UUID, ItemPlayer> PLAYERS = new ConcurrentHashMap<>();
 	public static ItemPlayer getPlayer(Player p) {
 		return PLAYERS.computeIfAbsent(p.getUniqueId(), ItemPlayer::new);
 	}

src/main/java/me/dadus33/chatitem/chatmanager/v1/basecomp/hook/AdventureComponentGetter.java

@@ -1,6 +1,8 @@
 package me.dadus33.chatitem.chatmanager.v1.basecomp.hook;
 
+import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -8,15 +10,18 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
 import me.dadus33.chatitem.ChatItem;
+import me.dadus33.chatitem.chatmanager.ChatManager;
 import me.dadus33.chatitem.chatmanager.v1.basecomp.IBaseComponentGetter;
 import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
-import me.dadus33.chatitem.utils.PacketUtils;
+import me.dadus33.chatitem.utils.ReflectionUtils;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.chat.ComponentSerializer;
 
 public class AdventureComponentGetter implements IBaseComponentGetter {
 
+	private boolean useExtra = false;
+	
 	@Override
 	public boolean hasConditions() {
 		try {
@@ -26,36 +31,70 @@ public class AdventureComponentGetter implements IBaseComponentGetter {
 		} catch (ClassNotFoundException e) { // can't support this, adventure comp not found
 			return false;
 		}
-		try {
-			PacketUtils.getNmsClass("PacketPlayOutChat", "network.protocol.game.", "ClientboundSystemChatPacket").getField("adventure$message");
-		} catch (Exception e) {
-			return false;
-		}
 		return true;
 	}
 	
 	@Override
 	public String getBaseComponentAsJSON(ChatItemPacket packet) {
 		Component comp = packet.getContent().getSpecificModifier(Component.class).readSafely(0);
-		if(comp == null)
+		if(comp == null) {
+			ChatItem.debug("The component is null.");
 			return null;
+		}
 		String json = ComponentSerializer.toString(BungeeComponentSerializer.legacy().serialize(comp).clone());
+		ChatItem.debug("AdventureJSON : " + json.replace(ChatManager.SEPARATOR, 'S'));
 		JsonObject jsonObj = JsonParser.parseString(json).getAsJsonObject();
-		JsonObject next = new JsonObject();
-		next.add("extra", jsonObj.get("with"));
-		return next.toString();
+		if(jsonObj.has("with")) {
+			JsonObject next = new JsonObject();
+			next.add("extra", jsonObj.get("with"));
+			return next.toString();
+		}
+		useExtra = true;
+		return json;
 	}
 
 	@Override
 	public void writeJson(ChatItemPacket packet, String json) {
-		JsonObject next = new JsonObject();
+		/*JsonObject next = new JsonObject();
 		next.addProperty("translate", "chat.type.text");
-		next.add("with", fixParsedArray(JsonParser.parseString(json).getAsJsonObject().getAsJsonArray("extra")));
-		ChatItem.debug("Adventure Json: " + next.toString());
-		packet.getContent().getSpecificModifier(Component.class).write(0, BungeeComponentSerializer.legacy().deserialize(ComponentSerializer.parse(next.toString())));
+		if(useExtra)
+			next.add("with", fixParsedArray(JsonParser.parseString(json).getAsJsonObject().getAsJsonArray("extra")));
+		else
+			next.add("extra", fixParsedArray(JsonParser.parseString(json).getAsJsonObject().getAsJsonArray("extra")));*/
+		JsonElement globalElement = JsonParser.parseString(json);
+		JsonArray extraArray = fixParsedArray(globalElement.getAsJsonObject().getAsJsonArray("extra"));
+		String localJson;
+		if(useExtra) {
+			globalElement.getAsJsonObject().add("extra", extraArray);
+			localJson = globalElement.toString();
+		} else {
+			JsonObject next = new JsonObject();
+			next.addProperty("translate", "chat.type.text");
+			next.add("with", extraArray);
+			localJson = next.toString();
+		}
+		ChatItem.debug("Adventure Json: " + json);
+		try {
+			Class<?> packetClass = packet.getPacket().getClass();
+			if(packetClass.getSimpleName().equalsIgnoreCase("PacketPlayOutChat")) {
+				Field componentField = ReflectionUtils.getFirstFieldWith(packetClass, Component.class);
+				if(componentField != null) {
+					componentField.setAccessible(true);
+					componentField.set(packet.getPacket(), BungeeComponentSerializer.legacy().deserialize(ComponentSerializer.parse(localJson)));
+				} else {
+					throw new UnsupportedOperationException("The packet PacketPlayOutChat doesn't have Kyori's field. It has: " + Arrays.asList(packetClass.getDeclaredFields()).stream().map(f -> f.getName() + ": " + f.getType().getName()).collect(Collectors.toList()));
+				}
+			} else if(packetClass.getSimpleName().equalsIgnoreCase("CliendboundSystemChatPacket")) {
+				packet.setPacket(packetClass.getConstructor(Component.class, String.class, int.class).newInstance(BungeeComponentSerializer.legacy().deserialize(ComponentSerializer.parse(localJson)), null, 1));
+			} else {
+				throw new UnsupportedOperationException("The packet " + packetClass.getSimpleName() + " insupported by the AdventureGetter. Please report this.");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 	
-	private JsonArray fixParsedArray(JsonArray arr) {
+	public JsonArray fixParsedArray(JsonArray arr) {
 		JsonArray next = new JsonArray();
 		for(JsonElement e : arr) {
 			if(e.isJsonArray()) {
@@ -90,7 +129,30 @@ public class AdventureComponentGetter implements IBaseComponentGetter {
 					val = val.replaceAll("\\\"", "\"");
 					ChatItem.debug("Fixed json: " + ("{" + val.substring(1, val.length() - 1) + "}"));
 					hoverObject.remove("value");
-					hoverObject.add("contents", JsonParser.parseString("{" + val.substring(1, val.length() - 1) + "}"));
+					JsonElement tagElement = JsonParser.parseString("{" + val.substring(1, val.length() - 1) + "}");
+					tagElement.getAsJsonObject().remove("tag");
+					/*if(tagElement.getAsJsonObject().has("tag")) {
+						JsonElement tag = tagElement.getAsJsonObject().get("tag");
+						if(tag.isJsonObject()) {
+							JsonObject tagObj = tag.getAsJsonObject();
+							tagObj.entrySet().forEach(entry -> {
+								ChatItem.debug("Tag json: " + entry.getKey() + " > " + entry.getValue());
+								JsonElement value = entry.getValue();
+								String sval = value.getAsString();
+								if(Utils.isInteger(sval)) {
+									if(Utils.isByte(sval))
+										tagObj.addProperty(entry.getKey(), sval + "b");
+									else if(Utils.isShort(sval))
+										tagObj.addProperty(entry.getKey(), sval + "s");
+									else if(Utils.isLong(sval))
+										tagObj.addProperty(entry.getKey(), sval + "l");
+									else
+										tagObj.addProperty(entry.getKey(), value + "i");
+								}
+							});
+						}
+					}*/
+					hoverObject.add("contents", tagElement);
 					o.add("hoverEvent", hoverObject);
 				}
 			}

src/main/java/me/dadus33/chatitem/chatmanager/v1/basecomp/hook/StringComponentGetter.java

@@ -1,21 +1,41 @@
 package me.dadus33.chatitem.chatmanager.v1.basecomp.hook;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import me.dadus33.chatitem.ChatItem;
 import me.dadus33.chatitem.chatmanager.v1.basecomp.IBaseComponentGetter;
 import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
-import me.dadus33.chatitem.utils.PacketUtils;
+import net.kyori.adventure.text.Component;
 
 public class StringComponentGetter implements IBaseComponentGetter{
 
 	@Override
 	public String getBaseComponentAsJSON(ChatItemPacket packet) {
-		return packet.getContent().getStrings().read(0);
+		String json = packet.getContent().getStrings().readSafely(0);
+		if(json != null && json.startsWith("[") && json.endsWith("]")) { // if used as array instead of json obj
+			JsonArray extra = new JsonArray();
+			for(JsonElement element : JsonParser.parseString(json).getAsJsonArray()) {
+				if(element.isJsonObject()) { // ignore this
+					extra.add(element);
+				} else {
+					ChatItem.debug("Ignoring element " + element);
+				}
+			}
+			JsonObject jsonObject = new JsonObject();
+			jsonObject.addProperty("text", "");
+			jsonObject.add("extra", extra);
+			json = jsonObject.toString();
+		}
+		return json;
 	}
 
 	@Override
 	public void writeJson(ChatItemPacket packet, String json) {
 		try {
-			Class<?> packetClass = PacketUtils.getNmsClass("ClientboundSystemChatPacket", "network.protocol.game.");
-			packet.setPacket(packetClass.getConstructor(String.class, int.class).newInstance(json, 1));
+			packet.setPacket(packet.getPacket().getClass().getConstructor(Component.class, String.class, int.class).newInstance(null, json, 1));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

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

@@ -46,7 +46,6 @@ public class JSONManipulatorCurrent {
 
 	public String parse(String json, String placeholder, ItemStack item, String replacement, int protocol)
 			throws Exception {
-		ChatItem.debug("Parsing: " + json);
 		JsonObject obj = JsonParser.parseString(json).getAsJsonObject();
 		JsonArray array = obj.has("extra") ? obj.getAsJsonArray("extra") : new JsonArray();
 		final AbstractMap.SimpleEntry<Version, ItemStack> p = new AbstractMap.SimpleEntry<>(

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

@@ -83,7 +83,7 @@ public class ChatEventListener implements Listener {
 			}
 			e.setMessage(msg.toString());
 			e.setFormat(e.getFormat().replace(oldMsg, e.getMessage())); // set own message for plugin that already put the message into the format
-			ChatItem.debug("Message: " + e.getMessage() + ", format: " + e.getFormat());
+			ChatItem.debug("Message: " + e.getMessage().replace(SEPARATOR, 'S') + ", format: " + e.getFormat());
 		} catch (Exception exc) {
 			exc.printStackTrace();
 		}

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

@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -65,11 +66,12 @@ public class ChatPacketManager extends PacketHandler {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		for(IBaseComponentGetter getter : Arrays.asList(new IChatBaseComponentGetter(), new BaseComponentGetter(), new ComponentGetter(), new AdventureComponentGetter())) {
+		for(IBaseComponentGetter getter : Arrays.asList(new IChatBaseComponentGetter(), new BaseComponentGetter(), new ComponentGetter(), new AdventureComponentGetter(), new StringComponentGetter())) {
 			if(getter.hasConditions())
 				baseComponentGetter.add(getter);
 		}
 		ChatItem.getInstance().getLogger().info("Loaded " + baseComponentGetter.size() + " getter for base components.");
+		ChatItem.debug("BaseComponentGetters: " + String.join(", ", baseComponentGetter.stream().map(IBaseComponentGetter::getClass).map(Class::getSimpleName).collect(Collectors.toList())));
 	}
 
 	@Override
@@ -85,11 +87,8 @@ public class ChatPacketManager extends PacketHandler {
 		if (version.isNewerOrEquals(Version.V1_19)) {
 			if(packet.getIntegers().readSafely(0, 0) != 1)
 				return;
-			String foundedJson = packet.getStrings().readSafely(0);
-			if(foundedJson != null) {
-				json = foundedJson;
-				choosedGetter = new StringComponentGetter();
-			}
+			choosedGetter = new StringComponentGetter();
+			json = choosedGetter.getBaseComponentAsJSON(e); // if null, will be re-checked so anyway
 		} else if (version.isNewerOrEquals(Version.V1_12)) {
 			// only if action bar messages are supported in this version of minecraft
 			try {
@@ -108,7 +107,6 @@ public class ChatPacketManager extends PacketHandler {
 			for(IBaseComponentGetter getters : baseComponentGetter) {
 				String tmpJson = getters.getBaseComponentAsJSON(e);
 				if(tmpJson != null) {
-					ChatItem.debug("Found " + tmpJson + " with " + getters.getClass().getName());
 					json = tmpJson;
 					choosedGetter = getters;
 					break;
@@ -124,8 +122,18 @@ public class ChatPacketManager extends PacketHandler {
 		}
 		if (!found) {
 			ChatItem.debug("No placeholders founded in " + json);
+			ChatItem.debug("String: " + packet.getStrings().getContent());
+			try {
+				Class<?> c = Class.forName("net.kyori.adventure.text.Component");
+				ChatItem.debug("Component: " + packet.getSpecificModifier(c).getContent());
+			} catch (ClassNotFoundException exc) {
+				ChatItem.debug("Can't find Kyori's component");
+			} catch(Exception exc) {
+				exc.printStackTrace();
+			}
 			return; // then it's just a normal message without placeholders, so we leave it alone
 		}
+		ChatItem.debug("Found " + json + " with " + choosedGetter.getClass().getName());
 		Object toReplace = null;
 		if (json.lastIndexOf(SEPARATOR) != -1)
 			toReplace = SEPARATOR;
@@ -135,7 +143,6 @@ public class ChatPacketManager extends PacketHandler {
 			ChatItem.debug("Not containing bell " + json);
 			return;
 		}
-		ChatItem.debug("Add packet meta to json: " + json);
 		IBaseComponentGetter fchoosedGetter = choosedGetter;
 		String fjson = json, toReplaceStr = toReplace.toString();
 		e.setCancelled(true); // We cancel the packet as we're going to resend it anyways (ignoring listeners

src/main/java/me/dadus33/chatitem/chatmanager/v1/packets/ChatItemPacketManager.java

@@ -16,7 +16,11 @@ public class ChatItemPacketManager {
 	public ChatItemPacketManager(ChatItem pl) {
 		Plugin protocolLibPlugin = Bukkit.getPluginManager().getPlugin("ProtocolLib");
 		if (protocolLibPlugin != null) {
-			if(checkProtocollibConditions()) {
+			String version = protocolLibPlugin.getDescription().getVersion();
+			if(version.contains("5.0.0-SNAPSHOT")) {
+				pl.getLogger().warning("ProtocolLib have been detected, but actually, snapshot have issues with chat packet. More informations here: https://github.com/dmulloy2/ProtocolLib/issues/1670.");
+				packetManager = new CustomPacketManager(pl);
+			} else if(checkProtocollibConditions()) {
 				pl.getLogger().info("The plugin ProtocolLib has been detected. Loading Protocollib support ...");
 				packetManager = new ProtocollibPacketManager(pl);
 			} else {

src/main/java/me/dadus33/chatitem/chatmanager/v1/packets/PacketType.java

@@ -43,7 +43,7 @@ public interface PacketType {
 	
 	public static enum Server implements PacketType {
 		
-		CHAT("Chat", "ClientboundSystemChatPacket"),
+		CHAT("Chat", "ClientboundPlayerChatPacket", "ClientboundSystemChatPacket"),
 		UNSET("Unset");
 		
 		private final String packetName, fullName;

src/main/java/me/dadus33/chatitem/chatmanager/v1/packets/custom/CustomPacketManager.java

@@ -82,8 +82,9 @@ public class CustomPacketManager extends PacketManager implements Listener {
 	}
 
 	public ChatItemPacket onPacketSent(PacketType type, Player sender, Object packet) {
-		if(type == null)
+		if(type == null) {
 			return null;
+		}
 		ChatItemPacket customPacket = new ChatItemPacket(type, packet, sender);
 		notifyHandlersSent(customPacket);
 		return customPacket;

src/main/java/me/dadus33/chatitem/chatmanager/v1/packets/protocollib/ProtocollibPacketManager.java

@@ -1,6 +1,7 @@
 package me.dadus33.chatitem.chatmanager.v1.packets.protocollib;
 
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.bukkit.entity.Player;
 
@@ -23,14 +24,20 @@ public class ProtocollibPacketManager extends PacketManager {
 	
 	public ProtocollibPacketManager(ChatItem pl) {
 		protocolManager = ProtocolLibrary.getProtocolManager();
-		protocolManager.addPacketListener(new PacketAdapter(pl, ListenerPriority.LOWEST, Arrays.asList(Play.Server.CHAT)) {
+		List<com.comphenix.protocol.PacketType> list = new ArrayList<>();
+		list.add(Play.Server.CHAT);
+		try {
+			list.add((com.comphenix.protocol.PacketType) Play.Server.class.getDeclaredField("SYSTEM_CHAT").get(null));
+		} catch (Exception e) {
+			 // ignore because using old version
+		}
+		protocolManager.addPacketListener(new PacketAdapter(pl, ListenerPriority.LOWEST, list) {
 			@Override
 			public void onPacketSending(PacketEvent e) {
 				Player p = e.getPlayer();
 		        if (p == null || e.isPlayerTemporary())
 		        	return;
-				ChatItemPacket packet = onPacketSent(PacketType.getType(e.getPacket().getHandle().getClass().getSimpleName()),
-						p, e.getPacket().getHandle());
+				ChatItemPacket packet = onPacketSent(PacketType.getType(e.getPacket().getHandle().getClass().getSimpleName()), p, e.getPacket().getHandle());
 				if(packet == null) {
 					ChatItem.debug("Can't find packet: " + e.getPacket().getHandle().getClass().getName());
 					return;

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

@@ -154,9 +154,9 @@ public class ChatListener implements Listener {
 
 	private void showItem(Player to, Player origin, ItemStack item, String msg) {
 		ComponentBuilder builder = new ComponentBuilder("");
-		ChatColor color = ChatColor.RESET;
+		ChatColor color = ChatColor.WHITE;
 		String colorCode = "", text = "";
-		boolean waiting = false, isHex = false;
+		boolean waiting = false;
 		for (char args : msg.toCharArray()) {
 			if (args == '§') { // begin of color
 				if (colorCode.isEmpty() && !text.isEmpty()) { // text before this char
@@ -172,15 +172,23 @@ public class ChatListener implements Listener {
 					color = ChatColor.RESET;
 					continue;
 				}
-				if(args == 'x' && colorCode.isEmpty())
-					isHex = true;
-				colorCode += args; // a color by itself
+				if(args == 'x' && !colorCode.isEmpty()) {
+					text += ColorManager.getColorString(colorCode);
+					colorCode = "x";
+				} else
+					colorCode += args; // a color by itself
 			} else {
 				waiting = false;
 				if(!colorCode.isEmpty()) {
-					if(isHex && colorCode.length() >= 7)
-						color = ColorManager.getColor(colorCode);
-					else if(colorCode.length() == 1) // if only one color code
+					if(colorCode.startsWith("x") && colorCode.length() >= 7) {
+						if(colorCode.length() == 7)
+							color = ColorManager.getColor(colorCode);
+						else {
+							color = ColorManager.getColor(colorCode.substring(0, 7)); // only the hex code
+							ChatItem.debug("Adding color for " + colorCode.substring(7, colorCode.length()) + " (in " + colorCode + ")");
+							text += ColorManager.getColorString(colorCode.substring(7, colorCode.length()));
+						}
+					} else if(colorCode.length() == 1) // if only one color code
 						color = ColorManager.getColor(colorCode);
 					else
 						text += ColorManager.getColorString(colorCode);

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

@@ -84,7 +84,7 @@ public class ReflectionUtils {
 	}
 
 	/**
-	 * Get the first field which have the searching for class type
+	 * Get the first object which have the searching for class type
 	 * 
 	 * @param from the object where we will try to find the field
 	 * @param clazz the class that have to define the field
@@ -102,4 +102,23 @@ public class ReflectionUtils {
 		}
 		return null;
 	}
+
+	/**
+	 * Get the first field which have the searching for class type
+	 * 
+	 * @param from the object where we will try to find the field
+	 * @param clazz the class that have to define the field
+	 * @param searchingFor the class of the required field
+	 * @return the field (or null if not found)
+	 * @throws Exception if something gone wrong
+	 */
+	public static Field getFirstFieldWith(Class<?> clazz, Class<?> searchingFor) throws Exception {
+		for (Field f : clazz.getDeclaredFields()) {
+			if (f.getType().equals(searchingFor) && !Modifier.isStatic(f.getModifiers())) {
+				f.setAccessible(true);
+				return f;
+			}
+		}
+		return null;
+	}
 }

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

@@ -138,4 +138,40 @@ public class Utils {
 		}
 		return b;
 	}
+	
+	public static boolean isInteger(String s) {
+		try {
+			Integer.parseInt(s);
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+	
+	public static boolean isByte(String s) {
+		try {
+			Byte.parseByte(s);
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+	
+	public static boolean isShort(String s) {
+		try {
+			Short.parseShort(s);
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+	
+	public static boolean isLong(String s) {
+		try {
+			Long.parseLong(s);
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
 }