Fixed chat messages not showing up on velocity

LOOHP · May 15, 2024 · ca874ad · ca874ad
1 parent 7dcd744
commit ca874ad
Show file tree

Hide file tree

Showing 34 changed files with 53 additions and 62 deletions.
diff --git a/V1_10/pom.xml b/V1_10/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_10</artifactId>

diff --git a/V1_11/pom.xml b/V1_11/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_11</artifactId>

diff --git a/V1_12/pom.xml b/V1_12/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_12</artifactId>

diff --git a/V1_13/pom.xml b/V1_13/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_13</artifactId>

diff --git a/V1_13_1/pom.xml b/V1_13_1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_13_1</artifactId>

diff --git a/V1_14/pom.xml b/V1_14/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_14</artifactId>

diff --git a/V1_15/pom.xml b/V1_15/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_15</artifactId>

diff --git a/V1_16/pom.xml b/V1_16/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_16</artifactId>

diff --git a/V1_16_2/pom.xml b/V1_16_2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_16_2</artifactId>

diff --git a/V1_16_4/pom.xml b/V1_16_4/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_16_4</artifactId>

diff --git a/V1_17/pom.xml b/V1_17/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_17</artifactId>

diff --git a/V1_18/pom.xml b/V1_18/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_18</artifactId>

diff --git a/V1_18_2/pom.xml b/V1_18_2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_18_2</artifactId>

diff --git a/V1_19/pom.xml b/V1_19/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_19</artifactId>

diff --git a/V1_19_3/pom.xml b/V1_19_3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_19_3</artifactId>

diff --git a/V1_19_4/pom.xml b/V1_19_4/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_19_4</artifactId>

diff --git a/V1_20/pom.xml b/V1_20/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_20</artifactId>

diff --git a/V1_20_2/pom.xml b/V1_20_2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_20_2</artifactId>

diff --git a/V1_20_3/pom.xml b/V1_20_3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_20_3</artifactId>

diff --git a/V1_20_5/pom.xml b/V1_20_5/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_20_5</artifactId>

diff --git a/V1_20_6/pom.xml b/V1_20_6/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_20_6</artifactId>

diff --git a/V1_8/pom.xml b/V1_8/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_8</artifactId>

diff --git a/V1_8_3/pom.xml b/V1_8_3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_8_3</artifactId>

diff --git a/V1_8_4/pom.xml b/V1_8_4/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_8_4</artifactId>

diff --git a/V1_9/pom.xml b/V1_9/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_9</artifactId>

diff --git a/V1_9_4/pom.xml b/V1_9_4/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-V1_9_4</artifactId>

diff --git a/abstraction/pom.xml b/abstraction/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.loohp</groupId>
         <artifactId>InteractiveChat-Parent</artifactId>
-        <version>4.2.10.1</version>
+        <version>4.2.10.2</version>
     </parent>
 
     <artifactId>InteractiveChat-Abstraction</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -25,7 +25,7 @@
 	<groupId>com.loohp</groupId>
 	<artifactId>InteractiveChat</artifactId>
 	<name>InteractiveChat</name>
-	<version>4.2.10.1</version>
+	<version>4.2.10.2</version>
 
 	<description>Shows your item in hand, inventory contents and enderchest contents as well as placeholders in the chat!</description>
 	<url>https://github.com/LOOHP/InteractiveChat</url>

diff --git a/common/src/main/java/com/loohp/interactivechat/bungeemessaging/BungeeMessageSender.java b/common/src/main/java/com/loohp/interactivechat/bungeemessaging/BungeeMessageSender.java
@@ -52,7 +52,6 @@
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.regex.Pattern;
 
-@SuppressWarnings("UnstableApiUsage")
 public class BungeeMessageSender {
 
     public static final Pattern VALID_CUSTOM_CHANNEL = Pattern.compile("[a-z]+:[a-z0-9_]+");
@@ -239,7 +238,6 @@ public static boolean permissionCheckResponse(long time, int id, boolean value)
         return forwardData(time, 0x0B, out.toByteArray());
     }
 
-    @SuppressWarnings("deprecation")
     public static boolean resetAndForwardPlaceholderList(long time, Collection<ICPlaceholder> placeholderList) throws Exception {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeInt(placeholderList.size());

diff --git a/common/src/main/java/com/loohp/interactivechat/proxy/bungee/ServerPingBungee.java b/common/src/main/java/com/loohp/interactivechat/proxy/bungee/ServerPingBungee.java
@@ -23,12 +23,12 @@
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.loohp.interactivechat.proxy.objectholders.BackendInteractiveChatData;
 import com.loohp.interactivechat.registry.Registry;
+import com.loohp.interactivechat.utils.CustomStringUtils;
 import com.loohp.interactivechat.utils.DataStreamIO;
 import com.loohp.interactivechat.utils.MCVersion;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.chat.ComponentSerializer;
-import org.apache.commons.text.StringEscapeUtils;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 
@@ -149,7 +149,7 @@ public static CompletableFuture<ServerPingBungee> getPing(ServerInfo server) {
                             String descriptionAsStr = ChatColor.stripColor(ComponentSerializer.parse(description.toJSONString())[0].toPlainText());
                             data = (JSONObject) new JSONParser().parse(descriptionAsStr);
                         } else {
-                            data = (JSONObject) new JSONParser().parse(StringEscapeUtils.unescapeJava(descriptionObj.toString()));
+                            data = (JSONObject) new JSONParser().parse(CustomStringUtils.unescapeUnicode(descriptionObj.toString()));
                         }
                         present = (boolean) data.get("present");
                         version = (String) data.get("version");