Updated to 1.21 by switching to cosmos
This commit is contained in:
@@ -5,9 +5,11 @@ import com.alttd.chat.config.Config;
|
||||
import com.alttd.chat.database.Queries;
|
||||
import com.alttd.chat.objects.Nick;
|
||||
import com.alttd.chat.util.ALogger;
|
||||
import com.alttd.chat.util.Utility;
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
import com.google.common.io.ByteStreams;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.event.ClickEvent;
|
||||
import net.kyori.adventure.text.event.HoverEvent;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
@@ -29,7 +31,6 @@ import java.util.UUID;
|
||||
|
||||
public class NicknamesEvents implements Listener, PluginMessageListener {
|
||||
|
||||
|
||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
|
||||
public void onPlayerJoin(PlayerJoinEvent e) {
|
||||
|
||||
@@ -54,9 +55,9 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
|
||||
strippedNick = MiniMessage.miniMessage().stripTags(Nicknames.getInstance().getNick(player));
|
||||
} catch (NullPointerException ignored) {
|
||||
}
|
||||
// final String strippedNick = CMIChatColor.stripColor(Nicknames.getInstance().getNick(player));
|
||||
// final String strippedNick = CMIChatColor.stripColor(Nicknames.getInstance().getNick(player));
|
||||
|
||||
// final String cmiNick = Util.CMIChatColor.deColorize(Nicknames.getInstance().getNick(player));
|
||||
// final String cmiNick = Util.CMIChatColor.deColorize(Nicknames.getInstance().getNick(player));
|
||||
|
||||
if (nickName == null) {
|
||||
Nicknames.getInstance().resetNick(player);
|
||||
@@ -75,8 +76,8 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
|
||||
}
|
||||
|
||||
if (i > 0) {
|
||||
player.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_REQUESTS_ON_LOGIN,
|
||||
Placeholder.unparsed("amount", String.valueOf(i))));
|
||||
player.sendRichMessage(Config.NICK_REQUESTS_ON_LOGIN,
|
||||
Placeholder.unparsed("amount", String.valueOf(i)));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -93,7 +94,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
|
||||
String subChannel = in.readUTF();
|
||||
ALogger.info(channel + ": " + subChannel);
|
||||
if (!subChannel.equals("NickNameRequest") && !subChannel.equals("NickNameAccepted")
|
||||
&& !subChannel.equals("NickNameDenied") && !subChannel.equals("NickNameSet")) {
|
||||
&& !subChannel.equals("NickNameDenied") && !subChannel.equals("NickNameSet")) {
|
||||
return;
|
||||
}
|
||||
UUID playerUUID;
|
||||
@@ -110,18 +111,18 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
|
||||
name = offlinePlayer.getName() == null ? playerUUID.toString() : offlinePlayer.getName();
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
ALogger.error("Failed to read plugin message", e);
|
||||
return;
|
||||
}
|
||||
|
||||
MiniMessage miniMessage = MiniMessage.miniMessage();
|
||||
switch (subChannel) {
|
||||
case "NickNameRequest":
|
||||
Component component = miniMessage.deserialize(Config.NICK_REQUEST_NEW, Placeholder.parsed("player", name))
|
||||
ComponentLike component = miniMessage.deserialize(Config.NICK_REQUEST_NEW, Placeholder.parsed("player", name))
|
||||
.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND,
|
||||
"/nick review"))
|
||||
"/nick review"))
|
||||
.hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT,
|
||||
miniMessage.deserialize("<gold>Click this text to review the request!")));
|
||||
miniMessage.deserialize("<gold>Click this text to review the request!")));
|
||||
|
||||
ChatPlugin.getInstance().getServer().getOnlinePlayers().forEach(p -> {
|
||||
if (p.hasPermission("chat.command.nick.review")) {
|
||||
@@ -138,8 +139,9 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
|
||||
}
|
||||
break;
|
||||
case "NickNameAccepted":
|
||||
Component deserialize = miniMessage.deserialize("<green><name>'s nickname was accepted!",
|
||||
Placeholder.unparsed("name", name));
|
||||
|
||||
ComponentLike deserialize = Utility.parseMiniMessage("<green><name>'s nickname was accepted!",
|
||||
Placeholder.unparsed("name", name));
|
||||
ChatPlugin.getInstance().getServer().getOnlinePlayers().forEach(p -> {
|
||||
if (p.hasPermission("chat.command.nick.review")) {
|
||||
p.sendMessage(deserialize);
|
||||
@@ -153,14 +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, nick.getCurrentNick());
|
||||
target.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_CHANGED,
|
||||
Placeholder.unparsed("nickname", nick.getCurrentNick())));
|
||||
target.sendRichMessage(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));
|
||||
Placeholder.unparsed("name", name));
|
||||
Nick nick = Nicknames.getInstance().NickCache.get(playerUUID);
|
||||
|
||||
ChatPlugin.getInstance().getServer().getOnlinePlayers().forEach(p -> {
|
||||
@@ -181,9 +183,11 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
|
||||
if (offlinePlayer.isOnline()) {
|
||||
Player target = Bukkit.getPlayer(playerUUID);
|
||||
|
||||
if (target == null) break;
|
||||
target.sendMessage(MiniMessage.miniMessage().deserialize(Config.NICK_NOT_CHANGED,
|
||||
Placeholder.unparsed("nickname", nick.getCurrentNick())));
|
||||
if (target == null) {
|
||||
break;
|
||||
}
|
||||
target.sendRichMessage(Config.NICK_NOT_CHANGED,
|
||||
Placeholder.unparsed("nickname", nick.getCurrentNick()));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user