diff --git a/api/src/main/java/com/alttd/chat/objects/ChatUser.java b/api/src/main/java/com/alttd/chat/objects/ChatUser.java index aa67976..8dd9780 100755 --- a/api/src/main/java/com/alttd/chat/objects/ChatUser.java +++ b/api/src/main/java/com/alttd/chat/objects/ChatUser.java @@ -45,8 +45,8 @@ public class ChatUser { // // prefixAll = Utility.getPrefix(uuid, false); - replyTarget = null; - replyContinueTarget = null; + replyTarget = ""; + replyContinueTarget = ""; gcCooldown = System.currentTimeMillis(); // players can't use gc for 30 seconds after logging in if we use this? mails = Queries.getMails(uuid); ignoredPlayers = Queries.getIgnoredUsers(uuid); @@ -104,7 +104,7 @@ public class ChatUser { } public String getReplyContinueTarget() { - return replyTarget; + return replyContinueTarget; } public void setReplyTarget(String replyTarget) { diff --git a/build.gradle.kts b/build.gradle.kts index 6c465bb..0eefa41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -67,7 +67,7 @@ tasks { exclude { it.moduleName == "velocity" } } listOf( - "net.kyori.adventure.text.minimessage", +// "net.kyori.adventure.text.minimessage", "org.spongepowered.configurate" // ).forEach { relocate(it, "${rootProject.group}.lib.$it") } ).forEach { relocate(it, "${rootProject.group}.lib.${it.substringAfterLast(".")}") } diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java index a6b017d..ed2d90d 100755 --- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java +++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java @@ -12,6 +12,7 @@ import com.alttd.chat.util.Utility; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; @@ -55,19 +56,16 @@ public class ChatHandler { updatedMessage = Utility.parseColors(updatedMessage); } - if(updatedMessage.contains("[i]")) - updatedMessage = updatedMessage.replace("[i]", "<[i]>"); - updatedMessage = Utility.formatText(updatedMessage); TagResolver placeholders = TagResolver.resolver( Placeholder.parsed("message", updatedMessage), Placeholder.component("sendername", player.name()), - Placeholder.parsed("receivername", target), - Placeholder.component("[i]", itemComponent(player.getInventory().getItemInMainHand())) + Placeholder.parsed("receivername", target) ); - Component component = Utility.parseMiniMessage("", placeholders); + Component component = Utility.parseMiniMessage("", placeholders) + .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build()); sendPrivateMessage(player, target, "privatemessage", component); Component spymessage = Utility.parseMiniMessage(Config.MESSAGESPY, placeholders); @@ -98,19 +96,16 @@ public class ChatHandler { updatedMessage = Utility.parseColors(updatedMessage); } - if(updatedMessage.contains("[i]")) - updatedMessage = updatedMessage.replace("[i]", "<[i]>"); - updatedMessage = Utility.formatText(updatedMessage); TagResolver placeholders = TagResolver.resolver( Placeholder.parsed("message", updatedMessage), Placeholder.component("sendername", player.name()), - Placeholder.parsed("receivername", target), - Placeholder.component("[i]", itemComponent(player.getInventory().getItemInMainHand())) + Placeholder.parsed("receivername", target) ); - Component component = Utility.parseMiniMessage("", placeholders); + Component component = Utility.parseMiniMessage("", placeholders) + .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build()); sendPrivateMessage(player, target, "privatemessage", component); Component spymessage = Utility.parseMiniMessage(Config.MESSAGESPY, placeholders); @@ -158,19 +153,16 @@ public class ChatHandler { updatedMessage = Utility.parseColors(updatedMessage); } - if(updatedMessage.contains("[i]")) - updatedMessage = updatedMessage.replace("[i]", "<[i]>"); - updatedMessage = Utility.formatText(updatedMessage); TagResolver placeholders = TagResolver.resolver( Placeholder.component("sender", senderName), Placeholder.component("prefix", prefix), Placeholder.parsed("message", updatedMessage), - Placeholder.parsed("server", Bukkit.getServerName()), - Placeholder.component("[i]]", itemComponent(player.getInventory().getItemInMainHand())) + Placeholder.parsed("server", Bukkit.getServerName()) ); - Component component = Utility.parseMiniMessage(Config.GCFORMAT, placeholders); + Component component = Utility.parseMiniMessage(Config.GCFORMAT, placeholders) + .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build()); user.setGcCooldown(System.currentTimeMillis()); sendPluginMessage(player, "globalchat", component); } @@ -200,18 +192,16 @@ public class ChatHandler { updatedMessage = Utility.stripTokens(updatedMessage); } - if(updatedMessage.contains("[i]")) updatedMessage = updatedMessage.replace("[i]", "<[i]>"); - updatedMessage = Utility.formatText(updatedMessage); TagResolver placeholders = TagResolver.resolver( Placeholder.component("sender", senderName), Placeholder.parsed("message", updatedMessage), Placeholder.parsed("server", Bukkit.getServerName()), - Placeholder.parsed("channel", channel.getChannelName()), - Placeholder.component("[i]]", itemComponent(player.getInventory().getItemInMainHand())) + Placeholder.parsed("channel", channel.getChannelName()) ); - Component component = Utility.parseMiniMessage(channel.getFormat(), placeholders); + Component component = Utility.parseMiniMessage(channel.getFormat(), placeholders) + .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build()); if (channel.isProxy()) { sendChatChannelMessage(player, channel.getChannelName(), "chatchannel", component); @@ -246,7 +236,7 @@ public class ChatHandler { // updatedMessage = Utility.stripTokens(updatedMessage); // } // -// if(updatedMessage.contains("[i]")) updatedMessage = updatedMessage.replace("[i]", "<[i]>"); +// if(updatedMessage.contains("[i]")) updatedMessage = updatedMessage.replaceFirst("[i]", ""); // // updatedMessage = Utility.formatText(updatedMessage); // diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java index b010fc1..1ad7780 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java @@ -14,6 +14,7 @@ import io.papermc.paper.chat.ChatRenderer; import io.papermc.paper.event.player.AsyncChatEvent; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; @@ -64,16 +65,13 @@ public class ChatListener implements Listener, ChatRenderer { message = Utility.parseColors(message); } - if(message.contains("[i]")) - message = message.replace("[i]", "<[i]>"); // end of todo - message = Utility.formatText(message); TagResolver placeholders = TagResolver.resolver( - Placeholder.unparsed("message", message), // needs to be unparsed because of the placeholders repeating bug - Placeholder.component("[i]]", ChatHandler.itemComponent(player.getInventory().getItemInMainHand())) + Placeholder.unparsed("message", message) ); - Component component = Utility.parseMiniMessage("", placeholders); + Component component = Utility.parseMiniMessage("", placeholders) + .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build()); event.message(component); event.renderer(this); @@ -88,7 +86,7 @@ public class ChatListener implements Listener, ChatRenderer { Placeholder.component("prefix", user.getPrefix()), Placeholder.component("prefixall", user.getPrefixAll()), Placeholder.component("staffprefix", user.getStaffPrefix()), - Placeholder.component("message ", message) + Placeholder.component("message", message) ); return Utility.parseMiniMessage(Config.CHATFORMAT, placeholders); diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 848c0c4..04cfbe8 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { annotationProcessor("com.velocitypowered:velocity-api:3.1.0") implementation("mysql:mysql-connector-java:8.0.27") // mysql implementation("org.spongepowered", "configurate-yaml", "4.1.2") - implementation("net.kyori:adventure-text-minimessage:4.10.1") + compileOnly("net.kyori:adventure-text-minimessage:4.10.1") compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") compileOnly("com.alttd.proxydiscordlink:ProxyDiscordLink:1.0.0-BETA-SNAPSHOT") } diff --git a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java index b2cde6f..6274bcd 100755 --- a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java +++ b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java @@ -19,6 +19,7 @@ import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; @@ -128,8 +129,6 @@ public class ChatHandler { updatedMessage = Utility.stripTokens(updatedMessage); } - if(updatedMessage.contains("[i]")) updatedMessage = updatedMessage.replace("[i]", "<[i]>"); - updatedMessage = Utility.formatText(updatedMessage); TagResolver Placeholders = TagResolver.resolver( @@ -137,11 +136,11 @@ public class ChatHandler { Placeholder.component("sendername", senderName), Placeholder.unparsed("partyname", party.getPartyName()), Placeholder.unparsed("message", updatedMessage), - Placeholder.unparsed("server", serverConnection.getServer().getServerInfo().getName()), - Placeholder.component("[i]", item) + Placeholder.unparsed("server", serverConnection.getServer().getServerInfo().getName()) ); - Component partyMessage = Utility.parseMiniMessage(Config.PARTY_FORMAT, Placeholders); + Component partyMessage = Utility.parseMiniMessage(Config.PARTY_FORMAT, Placeholders) + .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(item).build());; sendPartyMessage(party, partyMessage, user.getIgnoredBy()); Component spyMessage = Utility.parseMiniMessage(Config.PARTY_SPY, Placeholders);