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

Switched to using minimessage (mostly)

Browse Source
This commit is contained in:
auto
2022-10-02 04:52:33 +02:00
parent 9407ba8bec
commit d7bd3aa222
5 changed files with 117 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
+12 -15
View File
@@ -12,7 +12,6 @@ import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
@@ -76,8 +75,8 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
}
if (i > 0) {
player.sendMessage(format(Config.NICK_REQUESTS_ON_LOGIN
.replace("%amount%", String.valueOf(i))));
player.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_REQUESTS_ON_LOGIN,
Placeholder.unparsed("amount", String.valueOf(i))));
}
}
}
@@ -119,7 +118,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
switch (subChannel) {
case "NickNameRequest":
String notification = NickUtilities.applyColor(Config.NICK_REQUEST_NEW
.replace("%player%", name));
.replace("%player%", name)); //TODO fix this needing .replace
Component component = miniMessage.deserialize(NickUtilities.applyColor(notification))
.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND,
"/nick review"))
@@ -141,10 +140,11 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
}
break;
case "NickNameAccepted":
final String messageAccepted = ChatColor.GREEN + name + "'s nickname was accepted!";
Component deserialize = miniMessage.deserialize("<green><name>'s nickname was accepted!",
Placeholder.unparsed("name", name));
ChatPlugin.getInstance().getServer().getOnlinePlayers().forEach(p -> {
if (p.hasPermission("utility.nick.review")) {
p.sendMessage(messageAccepted);
p.sendMessage(deserialize);
}
});
//No break on purpose
@@ -155,13 +155,14 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
Player target = Bukkit.getPlayer(playerUUID);
if (target != null && nick != null && nick.getCurrentNick() != null) {
Nicknames.getInstance().setNick(target.getUniqueId(), nick.getCurrentNick());
target.sendMessage(format(Config.NICK_CHANGED
.replace("%nickname%", nick.getCurrentNick())));
target.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_CHANGED,
Placeholder.unparsed("nickname", nick.getCurrentNick())));
}
}
break;
case "NickNameDenied":
final Component messageDenied = miniMessage.deserialize("<red><name>'s nickname was denied", Placeholder.unparsed("name", name));
final Component messageDenied = miniMessage.deserialize("<red><name>'s nickname was denied",
Placeholder.unparsed("name", name));
Nick nick = Nicknames.getInstance().NickCache.get(playerUUID);
ChatPlugin.getInstance().getServer().getOnlinePlayers().forEach(p -> {
@@ -183,14 +184,10 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
Player target = Bukkit.getPlayer(playerUUID);
if (target == null) break;
target.sendMessage(format(Config.NICK_NOT_CHANGED
.replace("%nickname%", nick.getCurrentNick())));
target.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_NOT_CHANGED,
Placeholder.unparsed("nickname", nick.getCurrentNick())));
}
break;
}
}
public static String format(final String m) {
return NickUtilities.applyColor(m);
}
}