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/NickUtilities.java
+4
View File
@@ -6,6 +6,10 @@ import com.alttd.chat.database.Queries;
import com.alttd.chat.objects.Nick;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.legacy.LegacyFormat;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
+37 -37
View File
@@ -10,7 +10,7 @@ import com.alttd.chat.objects.ChatUser;
import com.alttd.chat.objects.Nick;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import net.luckperms.api.LuckPerms;
@@ -46,7 +46,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
if (sender instanceof Player player) {
if (args.length == 0) {
sender.sendMessage(format(helpMessage(sender, HelpType.ALL)));
sender.sendMessage(MiniMessage.miniMessage().deserialize(helpMessage(sender, HelpType.ALL)));
return true;
}
switch (args[0].toLowerCase()) {
@@ -59,10 +59,10 @@ public class Nicknames implements CommandExecutor, TabCompleter {
if (offlinePlayer.isOnline() || offlinePlayer.hasPlayedBefore()) {
handleNick(player, offlinePlayer, args[2]);
} else {
sender.sendMessage(format(helpMessage(sender, HelpType.SET_OTHERS)));
sender.sendMessage(MiniMessage.miniMessage().deserialize(helpMessage(sender, HelpType.SET_OTHERS)));
}
} else if (args.length > 3) {
sender.sendMessage(format(helpMessage(sender, HelpType.SET_SELF, HelpType.SET_OTHERS)));
sender.sendMessage(MiniMessage.miniMessage().deserialize(helpMessage(sender, HelpType.SET_SELF, HelpType.SET_OTHERS)));
}
break;
case "review":
@@ -71,7 +71,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
ChatPlugin.getInstance().getServer().getPluginManager().registerEvents(nicknamesGui, ChatPlugin.getInstance());
nicknamesGui.openInventory(player);
} else {
sender.sendMessage(format(helpMessage(sender, HelpType.REVIEW)));
sender.sendMessage(MiniMessage.miniMessage().deserialize(helpMessage(sender, HelpType.REVIEW)));
}
break;
case "request":
@@ -83,7 +83,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
}
}.runTaskAsynchronously(ChatPlugin.getInstance());
} else {
sender.sendMessage(format(helpMessage(sender, HelpType.REQUEST)));
sender.sendMessage(MiniMessage.miniMessage().deserialize(helpMessage(sender, HelpType.REQUEST)));
}
break;
case "try":
@@ -91,16 +91,16 @@ public class Nicknames implements CommandExecutor, TabCompleter {
LuckPerms api = ChatAPI.get().getLuckPerms();
if (api != null) {
if (NickUtilities.validNick(player, player, args[1])) {
sender.sendMessage(format(Config.NICK_TRYOUT
.replace("%prefix", api.getUserManager().getUser(player.getUniqueId())
.getCachedData().getMetaData().getPrefix()) // TODO pull this from chatuser?
.replace("%nick%", args[1])));
sender.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_TRYOUT,
Placeholder.unparsed("prefix", api.getUserManager().getUser(player.getUniqueId())
.getCachedData().getMetaData().getPrefix()), // TODO pull this from chatuser?
Placeholder.unparsed("nick", args[1])));
}
} else {
sender.sendMessage(format(Config.NICK_NO_LUCKPERMS));
sender.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_NO_LUCKPERMS));
}
} else {
sender.sendMessage(format(helpMessage(sender, HelpType.TRY)));
sender.sendMessage(MiniMessage.miniMessage().deserialize(helpMessage(sender, HelpType.TRY)));
}
break;
case "current":
@@ -114,11 +114,11 @@ public class Nicknames implements CommandExecutor, TabCompleter {
}
break;
case "help":
sender.sendMessage(format(helpMessage(sender, HelpType.ALL)
sender.sendMessage(MiniMessage.miniMessage().deserialize(helpMessage(sender, HelpType.ALL)
+ "For more info on nicknames and how to use rgb colors go to: &bhttps://alttd.com/nicknames&f"));
break;
default:
sender.sendMessage(format(helpMessage(sender, HelpType.ALL)));
sender.sendMessage(MiniMessage.miniMessage().deserialize(helpMessage(sender, HelpType.ALL)));
}
} else {
sender.sendMessage("Console commands are disabled.");
@@ -189,15 +189,15 @@ public class Nicknames implements CommandExecutor, TabCompleter {
long waitTime = Config.NICK_WAIT_TIME;
if (timeSinceLastChange > waitTime || player.hasPermission("utility.nick.admin")) {
if (nick.hasRequest()) {
player.sendMessage(format(Config.NICK_REQUEST_PLACED
.replace("%oldRequestedNick%", nick.getNewNick())
.replace("%newRequestedNick%", nickName)));
player.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_REQUEST_PLACED,
Placeholder.unparsed("oldRequestedNick", nick.getNewNick()),
Placeholder.unparsed("newRequestedNick", nickName)));
}
nick.setNewNick(nickName);
nick.setRequestedDate(new Date().getTime());
} else {
player.sendMessage(format(Config.NICK_TOO_SOON
.replace("%time%", formatTime((timeSinceLastChange-waitTime)*-1))));
player.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_TOO_SOON,
Placeholder.unparsed("time", formatTime((timeSinceLastChange-waitTime)*-1))));
return;
}
} else {
@@ -205,8 +205,8 @@ public class Nicknames implements CommandExecutor, TabCompleter {
}
Queries.newNicknameRequest(uniqueId, nickName);
bungeeMessageRequest(player);
player.sendMessage(format(Config.NICK_REQUESTED
.replace("%nick%", nickName)));
player.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_REQUESTED,
Placeholder.unparsed("nick", nickName)));
}
private void bungeeMessageRequest(Player player) {
@@ -270,12 +270,12 @@ public class Nicknames implements CommandExecutor, TabCompleter {
}
if (!sender.equals(target)) {
sender.sendMessage(format(Config.NICK_RESET_OTHERS
.replace("%player%", target.getName())));
sender.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_RESET_OTHERS,
Placeholder.unparsed("player", target.getName())));
}
if (target.isOnline() && target.getPlayer() != null) {
target.getPlayer().sendMessage(format(Config.NICK_RESET));
target.getPlayer().sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_RESET));
}
NickEvent nickEvent = new NickEvent(sender.getName(), target.getName(), null, NickEvent.NickEventType.RESET);
@@ -302,18 +302,18 @@ public class Nicknames implements CommandExecutor, TabCompleter {
}
if (!sender.equals(target)) {
sender.sendMessage(format(Config.NICK_CHANGED_OTHERS
.replace("%targetplayer%", target.getName())
.replace("%nickname%", nickName)));
sender.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_CHANGED_OTHERS,
Placeholder.unparsed("targetplayer", target.getName()),
Placeholder.unparsed("nickname", nickName)));
if (target.isOnline()) {
target.getPlayer().sendMessage(format(Config.NICK_TARGET_NICK_CHANGE
.replace("%nickname%", getNick(target.getPlayer()))
.replace("%sendernick%", getNick(sender))
.replace("%player%", target.getName())));
target.getPlayer().sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_TARGET_NICK_CHANGE,
Placeholder.unparsed("nickname", getNick(target.getPlayer())),
Placeholder.unparsed("sendernick", getNick(sender)),
Placeholder.unparsed("player", target.getName())));
}
} else if (target.isOnline()) {
target.getPlayer().sendMessage(format(Config.NICK_CHANGED
.replace("%nickname%", getNick(target.getPlayer()))));
target.getPlayer().sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_CHANGED,
Placeholder.unparsed("nickname", getNick(target.getPlayer()))));
}
}
}
@@ -370,7 +370,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
private boolean hasPermission(CommandSender sender, String permission) {
if (!sender.hasPermission(permission)) {
sender.sendMessage(format(Config.NO_PERMISSION));
sender.sendMessage(MiniMessage.miniMessage().deserialize(Config.NO_PERMISSION));
return false;
}
return true;
@@ -391,9 +391,9 @@ public class Nicknames implements CommandExecutor, TabCompleter {
user.setDisplayName(nickName);
}
public static String format(final String m) {
return NickUtilities.applyColor(m);
}
// public static String format(final String m) {
// return NickUtilities.applyColor(m);
// }
public static Nicknames getInstance() {
return Nicknames.instance;
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);
}
}
galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
+41 -30
View File
@@ -7,7 +7,10 @@ import com.alttd.chat.events.NickEvent;
import com.alttd.chat.objects.Nick;
import com.alttd.chat.util.Utility;
import net.kyori.adventure.text.Component;
import net.md_5.bungee.api.ChatColor;
import net.kyori.adventure.text.minimessage.MiniMessage;
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;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
@@ -28,8 +31,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import static com.alttd.chat.nicknames.Nicknames.format;
import java.util.stream.Collectors;
public class NicknamesGui implements Listener {
@@ -83,19 +85,23 @@ public class NicknamesGui implements Listener {
}
private ItemStack createPlayerSkull(Nick nick, List<String> lore) {
MiniMessage miniMessage = MiniMessage.miniMessage();
ItemStack playerHead = new ItemStack(Material.PLAYER_HEAD);
SkullMeta meta = (SkullMeta) playerHead.getItemMeta();
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(nick.getUuid());
meta.setOwningPlayer(offlinePlayer);
meta.setDisplayName(offlinePlayer.getName());
String name = offlinePlayer.getName();
if (name == null)
meta.displayName(miniMessage.deserialize("UNKNOWN PLAYER NAME"));
else
meta.displayName(miniMessage.deserialize(offlinePlayer.getName()));
lore.replaceAll(s -> format(s
.replace("%newNick%", nick.getNewNick())
.replace("%oldNick%", nick.getCurrentNick() == null ? "None" : nick.getCurrentNick())
.replace("%lastChanged%", nick.getLastChangedDate() == 0 ? "Not Applicable" : nick.getLastChangedDateFormatted())));
meta.setLore(lore);
TagResolver resolver = TagResolver.resolver(
Placeholder.unparsed("newNick", nick.getNewNick()),
Placeholder.unparsed("oldNick", nick.getCurrentNick() == null ? "None" : nick.getCurrentNick()),
Placeholder.unparsed("lastChanged", nick.getLastChangedDate() == 0 ? "Not Applicable" : nick.getLastChangedDateFormatted()));
meta.lore(lore.stream().map(a -> miniMessage.deserialize(a, resolver)).collect(Collectors.toList()));
playerHead.setItemMeta(meta);
return playerHead;
@@ -136,7 +142,8 @@ public class NicknamesGui implements Listener {
final Player p = (Player) e.getWhoClicked();
if (clickedItem.getType().equals(Material.PAPER)) {
if (clickedItem.getItemMeta().getDisplayName().equals("Next Page")) {
String serialize = PlainTextComponentSerializer.plainText().serialize(clickedItem.getItemMeta().displayName());
if (serialize.equals("Next Page")) {
setItems(currentPage + 1);
}
} else if (clickedItem.getType().equals(Material.PLAYER_HEAD)) {
@@ -147,7 +154,7 @@ public class NicknamesGui implements Listener {
OfflinePlayer owningPlayer = meta.getOwningPlayer();
if (owningPlayer == null) {
p.sendMessage(format(Config.NICK_USER_NOT_FOUND));
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_USER_NOT_FOUND));
return;
}
@@ -165,8 +172,8 @@ public class NicknamesGui implements Listener {
}
if (nick == null || !nick.hasRequest()) {
p.sendMessage(format(Config.NICK_ALREADY_HANDLED
.replace("%targetPlayer%", clickedItem.getItemMeta().getDisplayName())));
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_ALREADY_HANDLED,
Placeholder.component("targetPlayer", clickedItem.getItemMeta().displayName())));
return;
}
@@ -184,14 +191,14 @@ public class NicknamesGui implements Listener {
}
}.runTask(ChatPlugin.getInstance());
p.sendMessage(format(Config.NICK_ACCEPTED
.replace("%targetPlayer%", clickedItem.getItemMeta().getDisplayName())
.replace("%newNick%", nick.getNewNick())
.replace("%oldNick%", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick())));
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_ACCEPTED,
Placeholder.component("targetPlayer", clickedItem.getItemMeta().displayName()),
Placeholder.unparsed("newNick", nick.getNewNick()),
Placeholder.unparsed("oldNick", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick())));
if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getNewNick());
// owningPlayer.getPlayer().sendMessage(format(Config.NICK_CHANGED // This message is also send when the plugin message is received
// owningPlayer.getPlayer().sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_CHANGED // This message is also send when the plugin message is received
// .replace("%nickname%", nick.getNewNick())));
}
@@ -212,11 +219,12 @@ public class NicknamesGui implements Listener {
e.getInventory().setItem(e.getSlot(), itemStack);
p.updateInventory();
} else {
p.sendMessage(format(Config.NICK_PLAYER_NOT_ONLINE
.replace("%playerName%", clickedItem.getItemMeta().getDisplayName())));
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_PLAYER_NOT_ONLINE,
Placeholder.component("playerName", clickedItem.getItemMeta().displayName())));
}
} else if (e.isRightClick()) {
Component displayName = clickedItem.getItemMeta().displayName();
if (owningPlayer.hasPlayedBefore()) {
Queries.denyNewNickname(uniqueId);
@@ -230,10 +238,10 @@ public class NicknamesGui implements Listener {
}
}.runTask(ChatPlugin.getInstance());
p.sendMessage(format(Config.NICK_DENIED
.replace("%targetPlayer%", owningPlayer.getName())
.replace("%newNick%", nick.getNewNick())
.replace("%oldNick%", nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick())));
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_DENIED,
Placeholder.unparsed("targetPlayer", owningPlayer.getName()),
Placeholder.unparsed("newNick", nick.getNewNick()),
Placeholder.unparsed("oldNick", nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick())));
if (Nicknames.getInstance().NickCache.containsKey(uniqueId)
&& Nicknames.getInstance().NickCache.get(uniqueId).getCurrentNick() != null) {
@@ -246,11 +254,12 @@ public class NicknamesGui implements Listener {
if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
Nicknames.getInstance().setNick(owningPlayer.getUniqueId(), nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick());
owningPlayer.getPlayer().sendMessage(format(Config.NICK_NOT_CHANGED));
owningPlayer.getPlayer().sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_NOT_CHANGED));
}
NickUtilities.bungeeMessageHandled(uniqueId, e.getWhoClicked().getServer().getPlayer(e.getWhoClicked().getName()), "Denied");
final String messageDenied = ChatColor.RED + owningPlayer.getName() + "'s nickname was denied!";
final Component messageDenied = MiniMessage.miniMessage().deserialize("<red><name>'s nickname was denied!",
Placeholder.unparsed("name", owningPlayer.getName()));
ChatPlugin.getInstance().getServer().getOnlinePlayers().forEach(p -> {
if (p.hasPermission("utility.nick.review")) {
p.sendMessage(messageDenied);
@@ -260,14 +269,16 @@ public class NicknamesGui implements Listener {
ItemStack itemStack = new ItemStack(Material.SKELETON_SKULL);
ItemMeta itemMeta = itemStack.getItemMeta();
itemMeta.displayName(clickedItem.getItemMeta().displayName());
itemMeta.displayName(displayName);
itemMeta.lore(clickedItem.lore());
itemStack.setItemMeta(itemMeta);
e.getInventory().setItem(e.getSlot(), itemStack);
p.updateInventory();
} else {
p.sendMessage(format(Config.NICK_PLAYER_NOT_ONLINE
.replace("%playerName%", clickedItem.getItemMeta().getDisplayName())));
if (displayName == null)
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_PLAYER_NOT_ONLINE, Placeholder.parsed("playerName", "UNKNOWN PLAYER NAME")));
else
p.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_PLAYER_NOT_ONLINE, Placeholder.component("playerName", displayName)));
}
}
}