From 96edb124f0d24616c8d16a4ccefd7a42f3dd65cb Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Tue, 7 Apr 2020 17:59:09 -0400 Subject: [PATCH] Cleanup format API function calls to allow for easier usage. --- .../mineverse/Aust1n46/chat/MineverseChat.java | 4 +--- .../mineverse/Aust1n46/chat/command/chat/Edit.java | 2 +- .../Aust1n46/chat/command/chat/Removemessage.java | 2 +- .../Aust1n46/chat/listeners/ChatListener.java | 4 +--- .../mineverse/Aust1n46/chat/utilities/Format.java | 10 +++++++++- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index 3685526..a5494fb 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -110,7 +110,6 @@ import org.bukkit.Sound; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.utility.MinecraftReflection; -import com.comphenix.protocol.wrappers.WrappedChatComponent; import me.clip.placeholderapi.PlaceholderAPI; @@ -747,8 +746,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { } String json = Format.formatModerationGUI(globalJSON, p.getPlayer(), senderName, chatchannel, hash); - WrappedChatComponent chatComponent = WrappedChatComponent.fromJson(json); - PacketContainer packet = Format.createPacketPlayOutChat(chatComponent); + PacketContainer packet = Format.createPacketPlayOutChat(json); if(this.getConfig().getBoolean("ignorechat", false)) { if(!p.getIgnores().contains(senderUUID)) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java index 028f2d5..e72000b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java @@ -20,7 +20,7 @@ import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Edit extends MineverseCommand { - private PacketContainer emptyLinePacketContainer = Format.createPacketPlayOutChat(WrappedChatComponent.fromJson("{\"extra\":[\" \"],\"text\":\"\"}")); + private PacketContainer emptyLinePacketContainer = Format.createPacketPlayOutChat("{\"extra\":[\" \"],\"text\":\"\"}"); private MineverseChat plugin = MineverseChat.getInstance(); private WrappedChatComponent messageDeletedComponentPlayer; diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java index d697835..a929156 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java @@ -24,7 +24,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.wrappers.WrappedChatComponent; public class Removemessage extends MineverseCommand { - private PacketContainer emptyLinePacketContainer = Format.createPacketPlayOutChat(WrappedChatComponent.fromJson("{\"extra\":[\" \"],\"text\":\"\"}")); + private PacketContainer emptyLinePacketContainer = Format.createPacketPlayOutChat("{\"extra\":[\" \"],\"text\":\"\"}"); private MineverseChat plugin = MineverseChat.getInstance(); private WrappedChatComponent messageDeletedComponentPlayer; diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index 5f31360..90501b6 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -18,7 +18,6 @@ import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.plugin.PluginManager; import com.comphenix.protocol.events.PacketContainer; -import com.comphenix.protocol.wrappers.WrappedChatComponent; import com.massivecraft.factions.entity.MPlayer; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.TownyUniverse; @@ -501,8 +500,7 @@ public class ChatListener implements Listener { } for(Player p : recipients) { String json = Format.formatModerationGUI(globalJSON, p, mcp.getName(), channel.getName(), hash); - WrappedChatComponent chatComponent = WrappedChatComponent.fromJson(json); - PacketContainer packet = Format.createPacketPlayOutChat(chatComponent); + PacketContainer packet = Format.createPacketPlayOutChat(json); Format.sendPacketPlayOutChat(p, packet); } Bukkit.getConsoleSender().sendMessage(consoleChat); diff --git a/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java b/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java index a442f05..ae8ed22 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java +++ b/MineverseChat/mineverse/Aust1n46/chat/utilities/Format.java @@ -124,7 +124,7 @@ public class Format { return temp; } - private static String convertLinks(String s) { + public static String convertLinks(String s) { String remaining = s; String temp = ""; int indexLink = -1; @@ -294,6 +294,14 @@ public class Format { return json; } + public static PacketContainer createPacketPlayOutChat(String json) { + WrappedChatComponent component = WrappedChatComponent.fromJson(json); + PacketContainer container = new PacketContainer(PacketType.Play.Server.CHAT); + container.getModifier().writeDefaults(); + container.getChatComponents().write(0, component); + return container; + } + public static PacketContainer createPacketPlayOutChat(WrappedChatComponent component) { PacketContainer container = new PacketContainer(PacketType.Play.Server.CHAT); container.getModifier().writeDefaults();