From be690cb43d01982234643577e9489820eef16a88 Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Thu, 8 Feb 2024 04:55:27 -0600
Subject: [PATCH] Small updates

---
 .../chat/listeners/CommandListener.java       |  2 +-
 .../listeners/PacketListenerSystemChat.java   |  2 +-
 .../Aust1n46/chat/utilities/Format.java       | 30 +++++++++----------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/main/java/mineverse/Aust1n46/chat/listeners/CommandListener.java b/src/main/java/mineverse/Aust1n46/chat/listeners/CommandListener.java
index 6505a5f..c3e3b5c 100644
--- a/src/main/java/mineverse/Aust1n46/chat/listeners/CommandListener.java
+++ b/src/main/java/mineverse/Aust1n46/chat/listeners/CommandListener.java
@@ -140,7 +140,7 @@ public class CommandListener implements Listener {
 	@EventHandler(priority = EventPriority.LOW)
 	public void InventoryClick(final InventoryClickEvent event) {
 		final Inventory inventory = event.getInventory();
-		final InventoryHolder inventoryHolder = inventory.getHolder(false);
+		final InventoryHolder inventoryHolder = inventory.getHolder();
 	    if (!(inventoryHolder instanceof ModerationGuiInventory)) {
 	        return;
 	    }
diff --git a/src/main/java/mineverse/Aust1n46/chat/listeners/PacketListenerSystemChat.java b/src/main/java/mineverse/Aust1n46/chat/listeners/PacketListenerSystemChat.java
index 11379d2..1c61ec9 100644
--- a/src/main/java/mineverse/Aust1n46/chat/listeners/PacketListenerSystemChat.java
+++ b/src/main/java/mineverse/Aust1n46/chat/listeners/PacketListenerSystemChat.java
@@ -27,7 +27,7 @@ public class PacketListenerSystemChat extends PacketAdapter {
 			return;
 		}
 
-		final WrappedChatComponent chat = event.getPacket().getChatComponents().read(0);
+		final WrappedChatComponent chat = event.getPacket().getChatComponents().readSafely(0);
 		if (chat == null) {
 			return;
 		}
diff --git a/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java b/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java
index e64f9c0..951e908 100644
--- a/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java
+++ b/src/main/java/mineverse/Aust1n46/chat/utilities/Format.java
@@ -2,6 +2,7 @@ package mineverse.Aust1n46.chat.utilities;
 
 import static mineverse.Aust1n46.chat.MineverseChat.getInstance;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -626,30 +627,27 @@ public class Format {
 		return coloredText;
 	}
 
-	public static String toPlainText(Object o, Class<?> c) {
-		List<Object> finalList = new ArrayList<>();
-		StringBuilder stringbuilder = new StringBuilder();
+	public static String toPlainText(final Object o, final Class<?> c) {
+		final List<Object> finalList = new ArrayList<>();
+		final StringBuilder stringbuilder = new StringBuilder();
 		try {
 			splitComponents(finalList, o, c);
 			for (Object component : finalList) {
+				final String methodName;
 				if (VersionHandler.is1_7()) {
-					final String text = (String) component.getClass().getMethod("e").invoke(component);
-					if (text.contains(ChatColor.stripColor(Format.FormatStringAll(MineverseChat.getInstance().getConfig().getString("guiicon"))))) {
-						continue; // skip adding moderation gui icon for message remover to properly compute hash
-					}
+					methodName = "e";
 				} else if(VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12() || VersionHandler.is1_13() || VersionHandler.is1_14() || VersionHandler.is1_15() || VersionHandler.is1_16() || VersionHandler.is1_17()){
-					final String text = (String) component.getClass().getMethod("getText").invoke(component);
-					if (text.contains(ChatColor.stripColor(Format.FormatStringAll(MineverseChat.getInstance().getConfig().getString("guiicon"))))) {
-						continue; // skip adding moderation gui icon for message remover to properly compute hash
-					}
+					methodName = "getText";
 				}
 				else {
-					final String text = (String) component.getClass().getMethod("getString").invoke(component);
-					if (text.contains(ChatColor.stripColor(Format.FormatStringAll(MineverseChat.getInstance().getConfig().getString("guiicon"))))) {
-						continue; // skip adding moderation gui icon for message remover to properly compute hash
-					}
-					stringbuilder.append(text);
+					methodName = "getString";
 				}
+				final String guiIcon = ChatColor.stripColor(Format.FormatStringAll(MineverseChat.getInstance().getConfig().getString("guiicon")));
+				final String text = (String) component.getClass().getMethod(methodName).invoke(component);
+				if (text.contains(guiIcon)) {
+					continue; // skip adding moderation gui icon for message remover to properly compute hash
+				}
+				stringbuilder.append(text);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();