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

Update Config.java references for Nicknames

Browse Source
This commit is contained in:
Len 2022-09-27 00:45:23 +02:00
parent 11ecf1ad16
commit a405862fe1
5 changed files with 87 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
api/src/main/java/com/alttd/chat/config/Config.java
View File

@ -478,58 +478,61 @@ public final class Config {
EMOTELIST_FOOTER = getString("commands.emotelist.footer", EMOTELIST_FOOTER);
}
// nicknames TODO minimessage for colors and placeholders
public static String NICK_CHANGED = "&eYour nickname was changed to %nickname%&e.";
public static String NICK_NOT_CHANGED = "&eYour nickname request was denied.";
public static String NICK_RESET = "&eNickname changed back to normal.";
public static String NICK_CHANGED_OTHERS = "&6%targetplayer%&e's nickname was changed to %nickname%&e.";
public static String NICK_TARGET_NICK_CHANGE = "&eYour nickname was changed to %nickname% &eby %sendernick%&e";
public static String NICK_RESET_OTHERS = "&6%player%&6's &enickname was reset back to normal.";
public static String NICK_INVALID_CHARACTERS = "&eYou can only use letters and numbers in nicknames.";
public static String NICK_INVALID_LENGTH = "&eNicknames need to be between 3 to 16 characters long.";
public static String NICK_PLAYER_NOT_ONLINE = "&cThat player is not online.";
public static String NICK_BLOCKED_COLOR_CODES = "&eYou have blocked color codes in that nickname.";
public static String NICK_USER_NOT_FOUND = "&cFailed to set nickname from player, try again from a server this player has been on before.";
public static String NICK_ACCEPTED = "&aYou accepted %targetPlayer%&a's nickname. They are now called %newNick%&a.";
public static String NICK_DENIED = "&aYou denied %targetPlayer%&a's nickname. They are still called %oldNick%&a.";
public static String NICK_ALREADY_HANDLED = "&c%targetPlayer%&c's nickname was already accepted or denied.";
public static String NICK_NO_LUCKPERMS = "&cDue to an issue with LuckPerms /nick try won't work at the moment.";
public static String NICK_TOO_SOON = "&cPlease wait %time%&c until requesting a new nickname";
public static String NICK_REQUEST_PLACED = "&aReplaced your previous request %oldRequestedNick%&a with %newRequestedNick%&a.";
public static String NICK_REQUEST_NEW = "&aNew nickname request by %player%&a!";
public static String NICK_TRYOUT = "&f%prefix&f %nick%&7: &fHi, this is what my new nickname could look like!";
public static String NICK_REQUESTED = "&aYour requested to be nicknamed %nick%&a has been received. Staff will accept or deny this request asap!";
public static String NICK_REVIEW_WAITING = "&aThere are %amount% nicknames waiting for review!";
public static String NICK_TAKEN = "&cSomeone else already has this nickname, or has this name as their username.";
public static String NICK_REQUESTS_ON_LOGIN = "&aCurrent nick requests: %amount%";
public static long NICK_WAIT_TIME = 86400000;
public static List<String> NICK_ITEM_LORE = new ArrayList<>();
public static List<String> NICK_BLOCKED_COLOR_CODESLIST = new ArrayList<>();
public static List<String> NICK_ALLOWED_COLOR_CODESLIST = new ArrayList<>();
private static void nicknameSettings() {
// NickChanged("Messages.NickChanged", "&eYour nickname was changed to %nickname%&e."),
// NickNotChanged("Messages.NickNotChanged", "&eYour nickname request was denied."),
// NickReset("Messages.NickReset", "&eNickname changed back to normal."),
// NickChangedOthers("Messages.NickChangedOthers", "&6%targetplayer%&e's nickname was changed to %nickname%&e."),
// NickTargetNickChange("Messages.NickTargetNickChange", "&eYour nickname was changed to %nickname% &eby %sendernick%&e"),
// NickResetOthers("Messages.NickResetOthers", "&6%player%&6's &enickname was reset back to normal."),
// NickInvalidCharacters("Messages.NickInvalidCharacters", "&eYou can only use letters and numbers in nicknames."),
// NickLengthInvalid("Messages.NickLengthInvalid", "&eNicknames need to be between 3 to 16 characters long."),
// NickPlayerNotOnline("Messages.NickPlayerNotOnline", "&cThat player is not online."),
// NickBlockedColorCodes("Messages.NickBlockedColorCodes", "&eYou have blocked color codes in that nickname."),
// NickUserNotFound("Messages.NickUserNotFound", "&cFailed to set nickname from player, try again from a server this player has been on before."),
// NickAccepted("Messages.NickAccepted", "&aYou accepted %targetPlayer%&a's nickname. They are now called %newNick%&a."),
// NickDenied("Messages.NickDenied", "&aYou denied %targetPlayer%&a's nickname. They are still called %oldNick%&a."),
// NickAlreadyHandled("Messages.NickAlreadyHandled", "&c%targetPlayer%&c's nickname was already accepted or denied."),
// NickNoLuckperms("Messages.NickNoLuckPerms", "&cDue to an issue with LuckPerms /nick try won't work at the moment."),
// NickTooSoon("Messages.NickTooSoon", "&cPlease wait %time%&c until requesting a new nickname"),
// NickRequestReplaced("Messages.NickRequestReplaced", "&aReplaced your previous request %oldRequestedNick%&a with %newRequestedNick%&a."),
// NickNewRequest("Messages.NickNewRequest", "&aNew nickname request by %player%&a!"),
// NickTryout("Messages.NickTryout", "&f%prefix&f %nick%&7: &fHi, this is what my new nickname could look like!"),
// NickRequested("Messages.NickRequested", "&aYour requested to be nicknamed %nick%&a has been received. Staff will accept or deny this request asap!"),
// NickReviewWaiting("Messages.NickReviewWaiting", "&aThere are %amount% nicknames waiting for review!"),
// NickTaken("Messages.NickTaken", "&cSomeone else already has this nickname, or has this name as their username."),
// NickRequestsOnLogin("Messages.NickRequestsOnLogin", "&aCurrent nick requests: %amount%"),
// // Nicknames
//
// if (!config.contains("Nicknames.Lore")) {
// List<String> lore = new ArrayList<>();
//
// lore.add("&bNew nick: %newNick%");
// lore.add("&bOld nick: %oldNick%");
// lore.add("&bLast changed: %lastChanged%");
// lore.add("&aLeft click to Accept &d| &cRight click to Deny");
//
// config.set("Nicknames.Lore", lore);
//
// notFoundInConfigMessage("Nicknames.Lore");
// }
//
// if (!config.contains("Nicknames.WaitTime")) {
// config.set("Nicknames.WaitTime", 86400000);
// notFoundInConfigMessage("Nicknames.WaitTime");
// }
//
// if (!config.contains("Nicknames.BlockedColorCodes")) {
// config.set("Nicknames.BlockedColorCodes", new String[]{"&k", "&l", "&n", "&m", "&o"});
// notFoundInConfigMessage("Nicknames.BlockedColorCodes");
// }
//
// if (!config.contains("Nicknames.AllowedColorCodes")) {
// config.set("Nicknames.AllowedColorCodes", new String[]{"&0", "&1", "&2", "&3", "&4", "&5", "&6", "&7", "&8", "&9", "&a", "&b", "&c", "&d", "&e", "&f", "&r"});
// notFoundInConfigMessage("Nicknames.AllowedColorCodes");
// }
NICK_CHANGED = getString("nicknames.messages.nick-changed", NICK_CHANGED);
NICK_NOT_CHANGED = getString("nicknames.messages.nick-not-changed", NICK_NOT_CHANGED);
NICK_RESET = getString("nicknames.messages.nick-reset", NICK_RESET);
NICK_CHANGED_OTHERS = getString("nicknames.messages.nick-changed-others", NICK_CHANGED_OTHERS);
NICK_TARGET_NICK_CHANGE = getString("nicknames.messages.nick-target-nick-change", NICK_TARGET_NICK_CHANGE);
NICK_RESET_OTHERS = getString("nicknames.messages.nick-reset-others", NICK_RESET_OTHERS);
NICK_INVALID_CHARACTERS = getString("nicknames.messages.nick-invalid-characters", NICK_INVALID_CHARACTERS);
NICK_INVALID_LENGTH = getString("nicknames.messages.nick-invalid-length", NICK_INVALID_LENGTH);
NICK_PLAYER_NOT_ONLINE = getString("nicknames.messages.nick-player-not-online", NICK_PLAYER_NOT_ONLINE);
NICK_BLOCKED_COLOR_CODES = getString("nicknames.messages.nick-blocked-color-codes", NICK_BLOCKED_COLOR_CODES);
NICK_USER_NOT_FOUND = getString("nicknames.messages.nick-user-not-found", NICK_USER_NOT_FOUND);
NICK_ACCEPTED = getString("nicknames.messages.nick-accepted", NICK_ACCEPTED);
NICK_DENIED = getString("nicknames.messages.nick-denied", NICK_DENIED);
NICK_ALREADY_HANDLED = getString("nicknames.messages.nick-already-handled", NICK_ALREADY_HANDLED);
NICK_NO_LUCKPERMS = getString("nicknames.messages.nick-no-luckperms", NICK_NO_LUCKPERMS);
NICK_TOO_SOON = getString("nicknames.messages.nick-too-soon", NICK_TOO_SOON);
NICK_REQUEST_PLACED = getString("nicknames.messages.nick-request-placed", NICK_REQUEST_PLACED);
NICK_REQUEST_NEW = getString("nicknames.messages.nick-request-new", NICK_REQUEST_NEW);
NICK_TRYOUT = getString("nicknames.messages.nick-tryout", NICK_TRYOUT);
NICK_REQUESTED = getString("nicknames.messages.nick-requested", NICK_REQUESTED);
NICK_REVIEW_WAITING = getString("nicknames.messages.nick-review-waiting", NICK_REVIEW_WAITING);
NICK_TAKEN = getString("nicknames.messages.nick-taken", NICK_TAKEN);
NICK_REQUESTS_ON_LOGIN = getString("nicknames.messages.nick-reauests-on-login", NICK_REQUESTS_ON_LOGIN);
NICK_WAIT_TIME = getLong("nicknames.wait-time", NICK_WAIT_TIME);
NICK_ITEM_LORE = getList("nicknames.item-lore", List.of("&bNew nick: %newNick%", "&bOld nick: %oldNick%", "&bLast changed: %lastChanged%", "&aLeft click to Accept &d| &cRight click to Deny"));
NICK_BLOCKED_COLOR_CODESLIST = getList("nicknames.blocked-color-codes", List.of("&k", "&l", "&n", "&m", "&o"));
NICK_ALLOWED_COLOR_CODESLIST = getList("nicknames.allowed-color-codes", List.of("&0", "&1", "&2", "&3", "&4", "&5", "&6", "&7", "&8", "&9", "&a", "&b", "&c", "&d", "&e", "&f", "&r"));
}
}

14
galaxy/src/main/java/com/alttd/chat/nicknames/NickUtilities.java
View File

@ -20,8 +20,6 @@ import java.util.UUID;
public class NickUtilities
{
public static String stringRegen;
static String[] blockedCodes = ChatPlugin.getInstance().getConfig().getStringList("Nicknames.BlockedColorCodes").toArray(new String[0]);;
static String[] allowedColorCodes = ChatPlugin.getInstance().getConfig().getStringList("Nicknames.AllowedColorCodes").toArray(new String[0]);;
public static String applyColor(String message) {
ChatColor hexColor1 = null;
@ -97,7 +95,7 @@ public class NickUtilities
public static String removeAllColors(String string) {
for (final String colorCodes : allowedColorCodes) {
for (final String colorCodes : Config.NICK_ALLOWED_COLOR_CODESLIST) {
string = string.replace(colorCodes, "");
}
@ -163,7 +161,7 @@ public class NickUtilities
if (uniqueId.equals(uuid)){
ChatPlugin.getInstance().getLogger().info(uuid + " " + uniqueId);
}
sender.sendMessage(applyColor(ChatPlugin.getInstance().getConfig().getString("Messages.NickTaken")));
sender.sendMessage(applyColor(Config.NICK_TAKEN));
return false;
}
}
@ -172,19 +170,19 @@ public class NickUtilities
return true;
} else {
sender.sendMessage(applyColor(ChatPlugin.getInstance().getConfig().getString("Messages.NickInvalidCharacters")));
sender.sendMessage(applyColor(Config.NICK_INVALID_CHARACTERS));
}
} else {
sender.sendMessage(applyColor(ChatPlugin.getInstance().getConfig().getString("Messages.NickLengthInvalid")));
sender.sendMessage(applyColor(Config.NICK_INVALID_LENGTH));
}
} else {
sender.sendMessage(applyColor(ChatPlugin.getInstance().getConfig().getString("Messages.NickBlockedColorCodes")));
sender.sendMessage(applyColor(Config.NICK_BLOCKED_COLOR_CODES));
}
return false;
}
public static boolean noBlockedCodes(final String getNick) {
for (final String blockedCodes : blockedCodes) {
for (final String blockedCodes : Config.NICK_BLOCKED_COLOR_CODESLIST) {
if (getNick.contains(blockedCodes)) {
return false;
}

24
galaxy/src/main/java/com/alttd/chat/nicknames/Nicknames.java
View File

@ -88,13 +88,13 @@ public class Nicknames implements CommandExecutor, TabCompleter {
LuckPerms api = ChatAPI.get().getLuckPerms();
if (api != null){
if (NickUtilities.validNick(player, player, args[1])) {
sender.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickTryout")
sender.sendMessage(format(Config.NICK_TRYOUT
.replace("%prefix", api.getUserManager().getUser(player.getUniqueId())
.getCachedData().getMetaData().getPrefix())
.replace("%nick%", args[1])));
}
} else {
sender.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickNoLuckPerms")));
sender.sendMessage(format(Config.NICK_NO_LUCKPERMS));
}
} else {
sender.sendMessage(format(helpMessage(sender, HelpType.TRY)));
@ -170,17 +170,17 @@ public class Nicknames implements CommandExecutor, TabCompleter {
if (NickCache.containsKey(uniqueId)){
Nick nick = NickCache.get(uniqueId);
long timeSinceLastChange = new Date().getTime() - nick.getLastChangedDate();
long waitTime = ChatPlugin.getInstance().getConfig().getLong("Nicknames.WaitTime");
long waitTime = Config.NICK_WAIT_TIME;
if (timeSinceLastChange > waitTime){
if (nick.hasRequest()){
player.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickRequestReplaced")
player.sendMessage(format(Config.NICK_REQUEST_PLACED
.replace("%oldRequestedNick%", nick.getNewNick())
.replace("%newRequestedNick%", nickName)));
}
nick.setNewNick(nickName);
nick.setRequestedDate(new Date().getTime());
} else {
player.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickTooSoon")
player.sendMessage(format(Config.NICK_TOO_SOON
.replace("%time%", formatTime((timeSinceLastChange-waitTime)*-1))));
return;
}
@ -189,7 +189,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
}
Queries.newNicknameRequest(uniqueId, nickName);
bungeeMessageRequest(player);
player.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickRequested")
player.sendMessage(format(Config.NICK_REQUESTED
.replace("%nick%", nickName)));
}
@ -254,12 +254,12 @@ public class Nicknames implements CommandExecutor, TabCompleter {
}
if (!sender.equals(target)){
sender.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickResetOthers")
sender.sendMessage(format(Config.NICK_RESET_OTHERS
.replace("%player%", target.getName())));
}
if (target.isOnline()){
target.getPlayer().sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickReset")));
target.getPlayer().sendMessage(format(Config.NICK_RESET));
}
NickEvent nickEvent = new NickEvent(sender.getName(), target.getName(), null, NickEvent.NickEventType.RESET);
@ -285,17 +285,17 @@ public class Nicknames implements CommandExecutor, TabCompleter {
}
if (!sender.equals(target)){
sender.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickChangedOthers")
sender.sendMessage(format(Config.NICK_CHANGED_OTHERS
.replace("%targetplayer%", target.getName())
.replace("%nickname%", nickName)));
if (target.isOnline()) {
target.getPlayer().sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickTargetNickChange")
target.getPlayer().sendMessage(format(Config.NICK_TARGET_NICK_CHANGE
.replace("%nickname%", getNick(target.getPlayer()))
.replace("%sendernick%", getNick(sender))
.replace("%player%", target.getName())));
}
} else if (target.isOnline()){
target.getPlayer().sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickChanged")
target.getPlayer().sendMessage(format(Config.NICK_CHANGED
.replace("%nickname%", getNick(target.getPlayer()))));
}
}
@ -353,7 +353,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
private boolean hasPermission(CommandSender sender, String permission) {
if (!sender.hasPermission(permission)){
sender.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NoPermission")));
sender.sendMessage(format(Config.NO_PERMISSION));
return false;
}
return true;

8
galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesEvents.java
View File

@ -73,7 +73,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
}
if (i > 0) {
player.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickRequestsOnLogin")
player.sendMessage(format(Config.NICK_REQUESTS_ON_LOGIN
.replace("%amount%", String.valueOf(i))));
}
}
@ -113,7 +113,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
switch (subChannel) {
case "NickNameRequest":
String notification = NickUtilities.applyColor(ChatPlugin.getInstance().getConfig().getString("Messages.NickNewRequest")
String notification = NickUtilities.applyColor(Config.NICK_REQUEST_NEW
.replace("%player%", name));
TextComponent component = new TextComponent(TextComponent.fromLegacyText(NickUtilities.applyColor(notification)));
component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/nick review"));
@ -148,7 +148,7 @@ 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(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickChanged")
target.sendMessage(format(Config.NICK_CHANGED
.replace("%nickname%", nick.getCurrentNick())));
}
}
@ -176,7 +176,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
Player target = Bukkit.getPlayer(playerUUID);
if (target == null) break;
target.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickNotChanged")
target.sendMessage(format(Config.NICK_NOT_CHANGED
.replace("%nickname%", nick.getCurrentNick())));
}
break;

19
galaxy/src/main/java/com/alttd/chat/nicknames/NicknamesGui.java
View File

@ -1,6 +1,7 @@
package com.alttd.chat.nicknames;
import com.alttd.chat.ChatPlugin;
import com.alttd.chat.config.Config;
import com.alttd.chat.database.Queries;
import com.alttd.chat.events.NickEvent;
import com.alttd.chat.objects.Nick;
@ -55,7 +56,7 @@ public class NicknamesGui implements Listener {
for (Nick nick : Nicknames.getInstance().NickCache.values()) {
if (nick.hasRequest()) {
if (limit >= i / 27) {
inv.setItem(i % 27, createPlayerSkull(nick, ChatPlugin.getInstance().getConfig().getStringList("Nicknames.Lore")));
inv.setItem(i % 27, createPlayerSkull(nick, Config.NICK_ITEM_LORE));
i++;
} else {
hasNextPage = true;
@ -146,7 +147,7 @@ public class NicknamesGui implements Listener {
OfflinePlayer owningPlayer = meta.getOwningPlayer();
if (owningPlayer == null) {
p.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickUserNotFound")));
p.sendMessage(format(Config.NICK_USER_NOT_FOUND));
return;
}
@ -164,7 +165,7 @@ public class NicknamesGui implements Listener {
}
if (nick == null || !nick.hasRequest()) {
p.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickAlreadyHandled")
p.sendMessage(format(Config.NICK_ALREADY_HANDLED
.replace("%targetPlayer%", clickedItem.getItemMeta().getDisplayName())));
return;
}
@ -183,14 +184,14 @@ public class NicknamesGui implements Listener {
}
}.runTask(ChatPlugin.getInstance());
p.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickAccepted")
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())));
if (owningPlayer.isOnline()) {
Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getNewNick());
owningPlayer.getPlayer().sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickChanged")
owningPlayer.getPlayer().sendMessage(format(Config.NICK_CHANGED
.replace("%nickname%", nick.getNewNick())));
}
@ -211,7 +212,7 @@ public class NicknamesGui implements Listener {
e.getInventory().setItem(e.getSlot(), itemStack);
p.updateInventory();
} else {
p.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.CantFindPlayer")
p.sendMessage(format(Config.NICK_PLAYER_NOT_ONLINE
.replace("%playerName%", clickedItem.getItemMeta().getDisplayName())));
}
@ -229,7 +230,7 @@ public class NicknamesGui implements Listener {
}
}.runTask(ChatPlugin.getInstance());
p.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickDenied")
p.sendMessage(format(Config.NICK_DENIED
.replace("%targetPlayer%", owningPlayer.getName())
.replace("%newNick%", nick.getNewNick())
.replace("%oldNick%", nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick())));
@ -245,7 +246,7 @@ public class NicknamesGui implements Listener {
if (owningPlayer.isOnline()) {
Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick());
owningPlayer.getPlayer().sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.NickNotChanged")));
owningPlayer.getPlayer().sendMessage(format(Config.NICK_NOT_CHANGED));
}
NickUtilities.bungeeMessageHandled(uniqueId, e.getWhoClicked().getServer().getPlayer(e.getWhoClicked().getName()), "Denied");
@ -265,7 +266,7 @@ public class NicknamesGui implements Listener {
e.getInventory().setItem(e.getSlot(), itemStack);
p.updateInventory();
} else {
p.sendMessage(format(ChatPlugin.getInstance().getConfig().getString("Messages.CantFindPlayer")
p.sendMessage(format(Config.NICK_PLAYER_NOT_ONLINE
.replace("%playerName%", clickedItem.getItemMeta().getDisplayName())));
}
}