Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update minimessage references

Browse Source
This commit is contained in:
Len
2022-05-27 00:31:36 +02:00
parent 0997c2bab6
commit c836452d19
6 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
+14 -24
View File
@@ -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("<message>", placeholders);
Component component = Utility.parseMiniMessage("<message>", 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("<message>", placeholders);
Component component = Utility.parseMiniMessage("<message>", 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]", "<item>");
//
// updatedMessage = Utility.formatText(updatedMessage);
//
galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
+5 -7
View File
@@ -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("<message>", placeholders);
Component component = Utility.parseMiniMessage("<message>", 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);