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

Change some minor things to Nicknames

Browse Source
This commit is contained in:
Len 2022-10-01 13:47:20 +02:00
parent df4ff7f6b3
commit 4b947996da
3 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter; import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.NotNull;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
@ -40,9 +41,8 @@ public class Nicknames implements CommandExecutor, TabCompleter {
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
if (sender instanceof Player) { if (sender instanceof Player player) {
Player player = (Player) sender;
if (args.length == 0) { if (args.length == 0) {
sender.sendMessage(format(helpMessage(sender, HelpType.ALL))); sender.sendMessage(format(helpMessage(sender, HelpType.ALL)));
return true; return true;
@ -91,7 +91,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
if (NickUtilities.validNick(player, player, args[1])) { if (NickUtilities.validNick(player, player, args[1])) {
sender.sendMessage(format(Config.NICK_TRYOUT sender.sendMessage(format(Config.NICK_TRYOUT
.replace("%prefix", api.getUserManager().getUser(player.getUniqueId()) .replace("%prefix", api.getUserManager().getUser(player.getUniqueId())
.getCachedData().getMetaData().getPrefix()) .getCachedData().getMetaData().getPrefix()) // TODO pull this from chatuser?
.replace("%nick%", args[1]))); .replace("%nick%", args[1])));
} }
} else { } else {
@ -121,7 +121,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) { public List<String> onTabComplete(CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
List<String> completions = new ArrayList<>(); List<String> completions = new ArrayList<>();
if (!sender.hasPermission("utility.nick")) return completions; if (!sender.hasPermission("utility.nick")) return completions;
@ -371,7 +371,7 @@ public class Nicknames implements CommandExecutor, TabCompleter {
public void resetNick(final Player player) { public void resetNick(final Player player) {
ChatUser user = ChatUserManager.getChatUser(player.getUniqueId()); ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
user.setDisplayName(player.getDisplayName()); user.setDisplayName(player.getName());
} }
public String getNick(final Player player) { public String getNick(final Player player) {
@ -384,11 +384,6 @@ public class Nicknames implements CommandExecutor, TabCompleter {
user.setDisplayName(nickName); user.setDisplayName(nickName);
} }
// @Deprecated
// public void setNick(final CommandSender sender, final Player player, final String nickName) {
// Bukkit.getServer().dispatchCommand(sender, "cmi nick " + nickName + " " + player.getName());
// }
public static String format(final String m) { public static String format(final String m) {
return NickUtilities.applyColor(m); return NickUtilities.applyColor(m);
} }

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

@ -20,6 +20,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.plugin.messaging.PluginMessageListener; import org.bukkit.plugin.messaging.PluginMessageListener;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.NotNull;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
@ -82,7 +83,7 @@ public class NicknamesEvents implements Listener, PluginMessageListener {
} }
@Override @Override
public void onPluginMessageReceived(String channel, Player player, byte[] message) { public void onPluginMessageReceived(String channel, @NotNull Player player, byte[] message) {
if (!channel.equals(Config.MESSAGECHANNEL)) { if (!channel.equals(Config.MESSAGECHANNEL)) {
return; return;
} }

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

@ -5,6 +5,8 @@ import com.alttd.chat.config.Config;
import com.alttd.chat.database.Queries; import com.alttd.chat.database.Queries;
import com.alttd.chat.events.NickEvent; import com.alttd.chat.events.NickEvent;
import com.alttd.chat.objects.Nick; 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.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@ -31,12 +33,12 @@ import static com.alttd.chat.nicknames.Nicknames.format;
public class NicknamesGui implements Listener { public class NicknamesGui implements Listener {
private Inventory inv; private final Inventory inv;
private int currentPage; private final int currentPage;
public NicknamesGui() { public NicknamesGui() {
// Create a new inventory, with no owner (as this isn't a real inventory) // Create a new inventory, with no owner (as this isn't a real inventory)
inv = Bukkit.createInventory(null, 36, "Nicknames GUI"); inv = Bukkit.createInventory(null, 36, Utility.parseMiniMessage("Nicknames GUI"));
// Put the items into the inventory // Put the items into the inventory
currentPage = 1; currentPage = 1;
@ -88,12 +90,10 @@ public class NicknamesGui implements Listener {
meta.setOwningPlayer(offlinePlayer); meta.setOwningPlayer(offlinePlayer);
meta.setDisplayName(offlinePlayer.getName()); meta.setDisplayName(offlinePlayer.getName());
for (int ii = 0; ii < lore.size(); ii++) { lore.replaceAll(s -> format(s
lore.set(ii, format(lore.get(ii)
.replace("%newNick%", nick.getNewNick()) .replace("%newNick%", nick.getNewNick())
.replace("%oldNick%", nick.getCurrentNick() == null ? "None" : nick.getCurrentNick()) .replace("%oldNick%", nick.getCurrentNick() == null ? "None" : nick.getCurrentNick())
.replace("%lastChanged%", nick.getLastChangedDate() == 0 ? "Not Applicable" : nick.getLastChangedDateFormatted()))); .replace("%lastChanged%", nick.getLastChangedDate() == 0 ? "Not Applicable" : nick.getLastChangedDateFormatted())));
}
meta.setLore(lore); meta.setLore(lore);
playerHead.setItemMeta(meta); playerHead.setItemMeta(meta);
@ -107,7 +107,7 @@ public class NicknamesGui implements Listener {
final ItemMeta meta = item.getItemMeta(); final ItemMeta meta = item.getItemMeta();
// Set the name of the item // Set the name of the item
meta.setDisplayName(name); meta.displayName(Component.text(name));
// Set the lore of the item // Set the lore of the item
meta.setLore(Arrays.asList(lore)); meta.setLore(Arrays.asList(lore));
@ -189,7 +189,7 @@ public class NicknamesGui implements Listener {
.replace("%newNick%", nick.getNewNick()) .replace("%newNick%", nick.getNewNick())
.replace("%oldNick%", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick()))); .replace("%oldNick%", nick.getCurrentNick() == null ? clickedItem.getItemMeta().getDisplayName() : nick.getCurrentNick())));
if (owningPlayer.isOnline()) { if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getNewNick()); Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getNewNick());
owningPlayer.getPlayer().sendMessage(format(Config.NICK_CHANGED owningPlayer.getPlayer().sendMessage(format(Config.NICK_CHANGED
.replace("%nickname%", nick.getNewNick()))); .replace("%nickname%", nick.getNewNick())));
@ -206,8 +206,8 @@ public class NicknamesGui implements Listener {
ItemStack itemStack = new ItemStack(Material.SKELETON_SKULL); ItemStack itemStack = new ItemStack(Material.SKELETON_SKULL);
ItemMeta itemMeta = itemStack.getItemMeta(); ItemMeta itemMeta = itemStack.getItemMeta();
itemMeta.setDisplayName(clickedItem.getItemMeta().getDisplayName()); itemMeta.displayName(clickedItem.getItemMeta().displayName());
itemMeta.setLore(clickedItem.getLore()); itemMeta.lore(clickedItem.lore());
itemStack.setItemMeta(itemMeta); itemStack.setItemMeta(itemMeta);
e.getInventory().setItem(e.getSlot(), itemStack); e.getInventory().setItem(e.getSlot(), itemStack);
p.updateInventory(); p.updateInventory();
@ -244,7 +244,7 @@ public class NicknamesGui implements Listener {
Nicknames.getInstance().NickCache.remove(uniqueId); Nicknames.getInstance().NickCache.remove(uniqueId);
} }
if (owningPlayer.isOnline()) { if (owningPlayer.isOnline() && owningPlayer.getPlayer() != null) {
Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick()); Nicknames.getInstance().setNick(owningPlayer.getPlayer(), nick.getCurrentNick() == null ? owningPlayer.getName() : nick.getCurrentNick());
owningPlayer.getPlayer().sendMessage(format(Config.NICK_NOT_CHANGED)); owningPlayer.getPlayer().sendMessage(format(Config.NICK_NOT_CHANGED));
} }
@ -260,8 +260,8 @@ public class NicknamesGui implements Listener {
ItemStack itemStack = new ItemStack(Material.SKELETON_SKULL); ItemStack itemStack = new ItemStack(Material.SKELETON_SKULL);
ItemMeta itemMeta = itemStack.getItemMeta(); ItemMeta itemMeta = itemStack.getItemMeta();
itemMeta.setDisplayName(clickedItem.getItemMeta().getDisplayName()); itemMeta.displayName(clickedItem.getItemMeta().displayName());
itemMeta.setLore(clickedItem.getLore()); itemMeta.lore(clickedItem.lore());
itemStack.setItemMeta(itemMeta); itemStack.setItemMeta(itemMeta);
e.getInventory().setItem(e.getSlot(), itemStack); e.getInventory().setItem(e.getSlot(), itemStack);
p.updateInventory(); p.updateInventory();